feat(build): replace assembly with action-build-push-images

.github/workflows/image.yml

@@ -88,6 +88,12 @@ jobs:
           cargo build --release --locked --target="${RUST_TARGET}" --features="${FEATURES}"
           mv "target/${RUST_TARGET}/release/symbolicator" ./symbolicator
 
+      - name: Upload Binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: symbolicator-binary-${{ matrix.arch }}
+          path: ./symbolicator
+
       - name: Split debug info
         run: |
           mkdir -p "/tmp/debug-info/"
@@ -112,113 +118,76 @@ jobs:
 
       - name: Prepare Docker Context
         run: |
-          mkdir docker-ctx
+          mkdir -p docker-ctx/binaries/linux/${{ matrix.arch }}
           cp Dockerfile docker-ctx/
-          mv symbolicator docker-ctx/
+          mv symbolicator docker-ctx/binaries/linux/${{ matrix.arch }}
 
       - name: Build Image
-        uses: docker/build-push-action@v6
+        uses: getsentry/action-build-and-push-images@b172ab61a5f7eabd58bd42ce231b517e79947c01
         with:
-          context: docker-ctx/
+          image_name: 'symbolicator'
           platforms: linux/${{ matrix.arch }}
-          tags: symbolicator-${{ matrix.arch }}
+          build_context: 'docker-ctx'
+          ghcr: false
+          google_ar: false
           outputs: type=docker,dest=/tmp/symbolicator-${{ matrix.arch }}.tar
-          push: false
 
       - name: Upload Image
         uses: actions/upload-artifact@v4
         with:
           name: symbolicator-image@${{ matrix.arch }}
           path: /tmp/symbolicator-${{ matrix.arch }}.tar
 
-  assemble-ghcr:
+  assemble:
     needs: [build-setup, build-image]
     if: "needs.build-setup.outputs.full_ci == 'true'"
 
-    name: Assemble for Github Container Registry
+    name: Assemble
     runs-on: ubuntu-latest
 
     permissions:
-      packages: write
-
-    env:
-      IMAGE: "ghcr.io/getsentry/symbolicator"
+      packages: write  # required for GHCR
+      contents: read
+      id-token: write  # required for GAR
 
     steps:
-      - name: Docker Login
-        run: docker login --username '${{ github.actor }}' --password-stdin ghcr.io <<< "$GHCR_TOKEN"
-        env:
-          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v5
 
-      - name: Download Images
+      - name: Download Binaries
         uses: actions/download-artifact@v5
         with:
-          pattern: symbolicator-image@*
-          path: /tmp
-          merge-multiple: true
+          pattern: symbolicator-binary-*
+          path: /tmp/docker-ctx
 
-      - &assemble
-        name: Assemble and Push Images
+      - name: Prepare Docker Context
         run: |
-          set -x
-
-          IMAGES=()
-          for image in /tmp/symbolicator-*.tar; do
-            NAME="$(basename $image .tar)"
-            ARCH="${NAME#*-}"
-            TARGET="${IMAGE}:${{ github.sha }}-${ARCH}"
-
-            docker load --input "${image}"
-            docker tag "${NAME}" "${TARGET}"
-            docker push "${TARGET}"
-
-            IMAGES+=("${TARGET}")
-          done
-
-          docker buildx imagetools create -t "${IMAGE}:${{ github.sha }}" "${IMAGES[@]}"
-
-          if [[ "${{ github.ref_name }}" == "master" ]]; then
-            docker buildx imagetools create -t "${IMAGE}:nightly" "${IMAGE}:${{ github.sha }}"
-          fi
-
-  assemble-ar:
-    needs: [build-setup, build-image]
-    if: "needs.build-setup.outputs.full_ci == 'true'"
-
-    name: Assemble for Google Artifact Registry
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      id-token: write
-
-    env:
-      IMAGE: "us-central1-docker.pkg.dev/sentryio/symbolicator/image"
-
-    steps:
-      - name: Google Auth
-        id: auth
-        uses: google-github-actions/auth@v3
+          cp Dockerfile /tmp/docker-ctx
+          mkdir -p /tmp/docker-ctx/binaries/linux/amd64 /tmp/docker-ctx/binaries/linux/arm64
+          mv /tmp/docker-ctx/symbolicator-binary-amd64/symbolicator /tmp/docker-ctx/binaries/linux/amd64
+          mv /tmp/docker-ctx/symbolicator-binary-arm64/symbolicator /tmp/docker-ctx/binaries/linux/arm64
+
+      # If action-build-and-push-images supports passing in a docker tar,
+      # then we can reuse the image artifact rather than this workaround
+      # (thankfully the build amounts to just a cp, wouldn't be doing this
+      # if the build was more complicated as we're building twice)
+
+      - name: Build and push images
+        if: "needs.build-setup.outputs.full_ci == 'true'"
+        uses: getsentry/action-build-and-push-images@b172ab61a5f7eabd58bd42ce231b517e79947c01
         with:
-          workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
-          service_account: [email protected]
-
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v3
-        with:
-          version: ">= 390.0.0"
-
-      - name: Configure Docker
-        run: gcloud auth configure-docker us-central1-docker.pkg.dev
-
-      - name: Download Images
-        uses: actions/download-artifact@v5
-        with:
-          pattern: symbolicator-image@*
-          path: /tmp
-          merge-multiple: true
-
-      - *assemble
+          image_name: 'symbolicator'
+          platforms: linux/amd64,linux/arm64
+          build_context: '/tmp/docker-ctx'
+          publish_on_pr: true  # TEMPORARY FOR TESTING
+          ghcr: true
+          google_ar: true
+          # note: nightly will only be tagged if on default branch
+          tag_nightly: true
+          # on GAR we expect latest tags, nightly is canonically only a GHCR thing for us
+          tag_latest: true
+          google_ar_image_name: us-central1-docker.pkg.dev/sentryio/symbolicator/image
+          google_workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
+          google_service_account: [email protected]
 
   gocd-artifacts:
     needs: [build-setup, build-image]

Dockerfile

@@ -6,7 +6,9 @@ COPY --from=gcr.io/distroless/cc-debian12:nonroot --chown=nonroot:nonroot /home/
 VOLUME ["/etc/symbolicator", "/data"]
 EXPOSE 3021
 
-ARG BINARY=./symbolicator
+ARG TARGETPLATFORM
+
+ARG BINARY=./binaries/$TARGETPLATFORM/symbolicator
 COPY ${BINARY} /bin/symbolicator
 
 ENTRYPOINT ["/bin/symbolicator"]