Remove ARM64 support - build amd64 only with Rosetta 2 support for Mac

- Remove linux/arm64 from build platforms
- Update README from multi-architecture to amd64-only
- Add comprehensive Mac/Rosetta 2 setup instructions
- Update CI/CD documentation
- Reason: Simplify builds and align with dispatcher-sdk constraints

Author: wildone

.github/workflows/build.yml

@@ -1,6 +1,11 @@
 name: build
 
-on: [push]
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
 
 jobs:
   build:
@@ -90,40 +95,94 @@ jobs:
           ls -latr $PACKAGE_PATH
           source <(curl -sL https://github.com/aem-design/aemdesign-docker/releases/latest/download/github_get_version.sh)
 
-      - name: build and test docker image
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ env.DOCKER_USERNAME }}
+          password: ${{ env.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and export to Docker
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          load: true
+          build-args: |
+            DOCKER_IMAGE_VERSION=${{ env.DOCKER_IMAGE_VERSION }}
+          tags: |
+            ${{ env.IMAGE }}:${{ env.GIT_BRANCH }}
+            ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE }}:${{ env.GIT_BRANCH }}
+
+      - name: test docker image
         run: |
-          docker build --build-arg DOCKER_IMAGE_VERSION="${DOCKER_IMAGE_VERSION}" --pull --squash -t $IMAGE:$GIT_BRANCH .
-          (cd test && bash ./run_tests.sh "$IMAGE:$GIT_BRANCH" "$PACKAGE_CKECK_COUNT")
-          docker images
+          cd test && bash ./run_tests.sh "ghcr.io/$GITHUB_REPOSITORY_OWNER/$IMAGE:$GIT_BRANCH" "$PACKAGE_CKECK_COUNT"
         env:
           PACKAGE_CKECK_COUNT: ${{ steps.config.outputs.PACKAGE_CKECK_COUNT }}
 
-      - name: login to docker registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${DOCKER_REGISTRY} -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+      - name: Run docker image analysis
+        continue-on-error: true
+        uses: MaxymVlasov/dive-action@v1.4.0
+        with:
+          image:  ${{ steps.docker_build.outputs.imageid }}
+          config-file: ${{ github.workspace }}/.dive-ci.yml
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: push image version
-        run: |
-          docker push $IMAGE:$GIT_BRANCH
-      - name: push latest image on master
-        if: github.ref == 'refs/heads/master'
+      - name: Generate tags
+        id: tags
         run: |
-          docker tag $IMAGE:$GIT_BRANCH $IMAGE:latest
-          docker push $IMAGE:latest
+          # Check if this is a tag push
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            # Extract tag name (e.g., refs/tags/2.0.187 -> 2.0.187)
+            VERSION_TAG="${{ github.ref_name }}"
+            TAGS="${IMAGE}:${VERSION_TAG}"
+            TAGS="${TAGS},ghcr.io/${GITHUB_REPOSITORY_OWNER}/${IMAGE}:${VERSION_TAG}"
+            echo "Building from git tag: ${VERSION_TAG}"
+          else
+            # Branch push - use branch name
+            TAGS="${IMAGE}:${GIT_BRANCH}"
+            TAGS="${TAGS},ghcr.io/${GITHUB_REPOSITORY_OWNER}/${IMAGE}:${GIT_BRANCH}"
+            if [ "${{ github.ref }}" = "refs/heads/master" ]; then
+              TAGS="${TAGS},${IMAGE}:latest"
+              TAGS="${TAGS},ghcr.io/${GITHUB_REPOSITORY_OWNER}/${IMAGE}:latest"
+            fi
+            echo "Building from branch: ${GIT_BRANCH}"
+          fi
+          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+          echo "Generated tags: ${TAGS}"
 
-      - name: update registry description with readme on master
-        if: github.ref == 'refs/heads/master'
-        run: |
-          docker run --rm -v $(pwd):/data/ aemdesign/dockerhub-description "$DOCKER_USERNAME" "$DOCKER_PASSWORD" "$IMAGE"
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            DOCKER_IMAGE_VERSION=${{ env.DOCKER_IMAGE_VERSION }}
+          tags: ${{ steps.tags.outputs.tags }}
 
-      - name: create release ${{ env.GITHUB_TAG }}
-        if: github.ref == 'refs/heads/master'
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2
+        continue-on-error: true
+        with:
+          username: ${{ env.DOCKER_USERNAME }}
+          password: ${{ env.DOCKER_PASSWORD }}
+          repository: aemdesign/aem
+      - uses: meeDamian/github-release@1.0
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          tag_name: ${{ env.GITHUB_TAG }}
-          release_name: ${{ env.GITHUB_TAG }}
-          body: ${{ steps.config.outputs.GIT_RELEASE_NOTES }}
-          draft: false
-          prerelease: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          body: ${{ env.GIT_RELEASE_NOTES }}

.gitignore

@@ -13,3 +13,4 @@ maven-eclipse.xml
 
 target/
 logs/
+jar/

README.md

@@ -1,6 +1,6 @@
-## Debian with AEM SDK
+## AEM SDK
 
-[![build_status](https://github.com/aem-design/docker-aem/workflows/build/badge.svg?branch=sdk-2023.1.10912)](https://github.com/aem-design/docker-aem/actions?query=workflow%3Abuild+branch%3Asdk-2023.1.10912)
+[![build_status](https://github.com/aem-design/docker-aem/workflows/build/badge.svg?branch=sdk-2025.7.21644)](https://github.com/aem-design/docker-aem/actions?query=workflow%3Abuild+branch%3Asdk-2025.7.21644)
 [![github license](https://img.shields.io/github/license/aem-design/aem)](https://github.com/aem-design/aem) 
 [![github issues](https://img.shields.io/github/issues/aem-design/aem)](https://github.com/aem-design/aem) 
 [![github last commit](https://img.shields.io/github/last-commit/aem-design/aem)](https://github.com/aem-design/aem) 
@@ -9,9 +9,23 @@
 [![docker pulls](https://img.shields.io/docker/pulls/aemdesign/aem)](https://hub.docker.com/r/aemdesign/aem) 
 [![github release](https://img.shields.io/github/release/aem-design/aem)](https://github.com/aem-design/aem)
 
-This is docker image based on CentOS 8 with Tini
-One image that can be used for both Author and Publish nodes
-No license is included, you will need to register when starting up
+Docker image based on [aemdesign/aem-base](https://hub.docker.com/r/aemdesign/aem-base/) with AEM SDK.
+
+One image that can be used for both Author and Publish nodes. No license is included, you will need to register when starting up.
+
+Docker image for linux/amd64 (also runs on Apple Silicon via Rosetta 2).
+
+## Docker Images
+
+Images are available on both registries:
+- **Docker Hub**: `aemdesign/aem`
+- **GitHub Container Registry**: `ghcr.io/aem-design/aem`
+
+### Tags
+
+- `latest` - Latest build from master branch
+- `sdk-2025.7.21644` - Current SDK version branch
+- Version tags (pushed when git tags are created)
 
 ### AEM Version
 
@@ -67,11 +81,104 @@ Following bundles are added to container
 
 ### Starting
 
-To start author run the following
+To start author run the following:
+
+```bash
+docker run --name author-sdk-2025-7-21644 -e "TZ=Australia/Sydney" -e "AEM_RUNMODE=-Dsling.run.modes=author,crx3,crx3tar,localdev" -e "AEM_JVM_OPTS=-server -Xms248m -Xmx1524m -XX:MaxDirectMemorySize=256M -XX:+CMSClassUnloadingEnabled -Djava.awt.headless=true -Dorg.apache.felix.http.host=0.0.0.0 -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=58242,suspend=n -XX:+UseParallelGC --add-opens=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED -Dnashorn.args=--no-deprecation-warning" -p4502:8080 -p30303:58242 -d aemdesign/aem:sdk-2025.7.21644
+```
+
+## Development
+
+### CI/CD Pipeline
+
+The project uses GitHub Actions for continuous integration and deployment:
+
+- **Platform**: Images are built for `linux/amd64`
+- **Apple Silicon support**: Works seamlessly on M1/M2/M3/M4 Macs via Docker Desktop's Rosetta 2 emulation
+- **Automated testing**: Java version is verified before pushing
+- **Image analysis**: Uses `dive` for Docker image layer analysis
+- **Dual registry push**: Automatically pushes to Docker Hub and GitHub Container Registry
+- **Git tag versioning**: Pushing a git tag automatically creates a corresponding Docker image tag
+
+### Running on Apple Silicon Macs (M1/M2/M3/M4)
+
+This image is built for `linux/amd64` architecture but runs seamlessly on Apple Silicon Macs through **Rosetta 2** emulation in Docker Desktop.
+
+#### Prerequisites
+
+1. **Docker Desktop for Mac** (version 4.25.0 or later recommended)
+   - Download from: https://www.docker.com/products/docker-desktop
+
+2. **Rosetta 2** (usually already installed on modern macOS)
+   - To verify/install: `softwareupdate --install-rosetta`
+
+#### Enable Rosetta 2 in Docker Desktop
+
+1. Open **Docker Desktop**
+2. Go to **Settings** (⚙️ icon) → **General**
+3. Enable **"Use Rosetta for x86_64/amd64 emulation on Apple Silicon"**
+4. Click **Apply & Restart**
+
+![Docker Desktop Rosetta Setting](https://docs.docker.com/desktop/images/rosetta.png)
+
+#### Verify It's Working
+
+```bash
+# Pull and run the image
+docker pull aemdesign/aem:latest
+docker run --rm aemdesign/aem:latest uname -m
+
+# Expected output: x86_64 (running via Rosetta 2)
+```
+
+#### Performance Notes
+
+- **Rosetta 2 emulation** provides near-native performance for most workloads
+- First container start may be slightly slower (Rosetta translation cache warmup)
+- Subsequent starts are fast
+- **No code changes needed** - everything works transparently
+
+### Monitoring Pipeline Status
+
+Use the `get-action-logs.ps1` PowerShell script to monitor GitHub Actions workflow status and logs.
+
+#### Prerequisites
+
+- GitHub CLI (`gh`) must be installed and authenticated
+- Install: `winget install --id GitHub.cli`
+- Authenticate: `gh auth login`
+
+#### Quick Start
+
+```powershell
+# Check current commit's pipeline status (saves logs to logs/ folder by default)
+.\get-action-logs.ps1
+
+# Wait for pipeline to complete
+.\get-action-logs.ps1 -WaitForCompletion
+
+# Show logs in console
+.\get-action-logs.ps1 -ShowLogs
+
+# Force re-download logs
+.\get-action-logs.ps1 -Force
+```
+
+See full documentation: `Get-Help .\get-action-logs.ps1 -Full`
+
+### Creating a New Release
 
 ```bash
-docker run --name author-sdk-2023-1-10912 -e "TZ=Australia/Sydney" -e "AEM_RUNMODE=-Dsling.run.modes=author,crx3,crx3tar,localdev" -e "AEM_JVM_OPTS=-server -Xms248m -Xmx1524m -XX:MaxDirectMemorySize=256M -XX:+CMSClassUnloadingEnabled -Djava.awt.headless=true -Dorg.apache.felix.http.host=0.0.0.0 -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=58242,suspend=n -XX:+UseParallelGC --add-opens=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED -Dnashorn.args=--no-deprecation-warning" -p4502:8080 -p30303:58242 -d aemdesign/aem:sdk-2022.4.7138
-``` 
+# Tag the commit
+git tag sdk-2025.7.21644-v1
+git push origin sdk-2025.7.21644-v1
+```
+
+This will automatically build and push versioned Docker images to both registries.
+
+## License
+
+See [LICENSE](LICENSE) file for details.