From b4057e31084e1d48d5d860dcfb49f493869b745a Mon Sep 17 00:00:00 2001
From: Noam Cohen <noam@noam.me>
Date: Tue, 2 Jul 2024 17:03:44 +0300
Subject: [PATCH] Add arm64 arch Docker image (#197)

Co-authored-by: Bartosz Bednarek <895578+bbednarek@users.noreply.github.com>
Co-authored-by: Armen Zambrano G <44410+armenzg@users.noreply.github.com>
---
 .github/workflows/build.yml | 56 ++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36a1e0ef..bcf56d20 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+
 env:
   # Variables defined in the repository
   SENTRY_ORG: ${{ vars.SENTRY_ORG }}
@@ -16,12 +17,34 @@ jobs:
   docker-build:
     name: Build & pubish Docker images
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        target:
+          - name: builder
+            image: action-release-builder-image:latest
+          - name: app
+            image: action-release-image:latest
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
     # BUILDKIT_INLINE_CACHE creates the image in such a way that you can
     # then use --cache-from (think of a remote cache)
     # This feature is allowed thanks to using the buildx plugin
@@ -29,35 +52,24 @@ jobs:
     # There's a COPY command in the builder stage that can easily invalidate the cache
     # If you notice, please add more exceptions to .dockerignore since we loose the value
     # of using --cache-from on the app stage
-    - name: Build Docker builder image
-      run: |
-        docker buildx build . \
-          --build-arg BUILDKIT_INLINE_CACHE=1 \
-          -t ghcr.io/getsentry/action-release-builder-image:latest \
-          --cache-from ghcr.io/getsentry/action-release-builder-image:latest \
-          --target builder
-
-    - name: Build Docker image
-      run: |
-        docker buildx build . \
-          --build-arg BUILDKIT_INLINE_CACHE=1 \
-          -t ghcr.io/getsentry/action-release-image:latest \
-          --cache-from ghcr.io/getsentry/action-release-image:latest \
-          --target app
-
-    - name: Login and publish
-      run: |
-        docker login ghcr.io -u $GITHUB_ACTOR --password-stdin <<< ${{ secrets.GITHUB_TOKEN }}
-        docker push ghcr.io/getsentry/action-release-builder-image:latest
-        docker push ghcr.io/getsentry/action-release-image:latest
+    - name: Build and push
+      uses: docker/build-push-action@v6
+      with:
+        platforms: linux/amd64,linux/arm64
+        push: ${{ github.ref == 'refs/heads/master' }}
+        tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.target.image }}
+        cache-from: ghcr.io/${{ github.repository_owner }}/${{ matrix.target.image }}
+        target: ${{ matrix.target.name }}
+        build-args: BUILDKIT_INLINE_CACHE=1
 
     # This step creates real Sentry releases for the action itself:
     # https://sentry-ecosystem.sentry.io/releases/?project=6576594
     - name: Sentry Release
       uses: getsentry/action-release@v1
+      if: vars.SENTRY_ORG != ''
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
         SENTRY_LOG_LEVEL: debug
       with:
         environment: 'production'
-        ignore_missing: true
\ No newline at end of file
+        ignore_missing: true