chore(ci): build multiplatform next container image

.github/actions/docker-build/action.yaml

@@ -36,6 +36,15 @@ inputs:
   push:
     description: Whether to push the image
     required: true
+  platform:
+    description: "Target given CPU platform architecture (default: linux/amd64)"
+    required: false
+    default: linux/amd64
+
+outputs:
+  digest:
+    value: ${{ steps.build.outputs.digest }}
+
 
 runs:
   using: composite
@@ -77,10 +86,12 @@ runs:
 
     - name: Build and push Docker image
       uses: docker/build-push-action@v5
+      id: build
       with:
         context: .
         file: docker/Dockerfile
         push: ${{ inputs.push }}
         provenance: false
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
+        platforms: ${{ inputs.platform }}

.github/actions/get-sha/action.yml

@@ -0,0 +1,47 @@
+# Copyright 2024 The Janus IDP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Get the last commit short SHA
+description: Get the last commit short SHA of the main branch or PR
+
+outputs:
+  short_sha:
+    description: The short SHA of the last commit
+    value: ${{ steps.build.outputs.sha }}
+
+
+runs:
+  using: composite
+  steps:
+    - name: Get the last commit short SHA
+      shell: bash
+      run: |
+        if [[ -n "${{ github.event.pull_request.head.sha }}" ]]; then
+          # running on a PR
+          REF="${{ github.event.pull_request.head.sha }}"
+          REPO="${{ github.repository }}/pull/${{ github.event.number }}"
+        else
+          # running on a main branch
+          # todo: handle other branches than main
+          REF="HEAD"
+          REPO="${{ github.repository }}"
+        fi
+        SHORT_SHA=$(git rev-parse --short=8 $REF)
+        echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV
+        if [[ -f packages/app/src/build-metadata.json ]]; then
+          now="$(date -u +%FT%TZ)"
+          sed -i packages/app/src/build-metadata.json -r \
+            -e 's|("Last Commit:.+)|"Last Commit: '$REPO' @ '$SHORT_SHA'"|'
+        fi
+        echo "short_sha=$SHORT_SHA" >> "$GITHUB_OUTPUT"

.github/workflows/next-build-image.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Next
+name: Build Next Image
 
 on:
   push:
@@ -25,11 +25,18 @@ concurrency:
 
 env:
   REGISTRY: quay.io
+  REGISTRY_IMAGE: ${{ github.repository }}
 
 jobs:
   build-image:
     name: Build Image
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     permissions:
       contents: read
       packages: write
@@ -40,26 +47,99 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get the last commit short SHA
+      - name: Prepare
         run: |
-          SHORT_SHA=$(git rev-parse --short=8 HEAD)
-          echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV
-          if [[ -f packages/app/src/build-metadata.json ]]; then
-            repo="${{ github.repository }}"
-            now="$(date -u +%FT%TZ)"
-            sed -i packages/app/src/build-metadata.json -r \
-              -e 's|("Last Commit:.+)|"Last Commit: '$repo' @ '$SHORT_SHA'"|'
-          fi
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+          echo "PLATFORM_ARCH=${platform#*/}" >> $GITHUB_ENV
+
+      - name: Get the last commit short SHA
+        uses: ./.github/actions/get-sha
+
 
       - name: Build and Push with Buildx
         uses: ./.github/actions/docker-build
+        id: build
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
+<<<<<<< HEAD
           imageName: rhdh-community/rhdh
+=======
+          imageName: ${{ env.REGISTRY_IMAGE }}
+>>>>>>> fbed803d (chore(ci): build multiplatform next container image)
           imageTags: |
-            type=raw,value=next
-            type=sha,prefix=next-
+            type=raw,value=next-${{ env.PLATFORM_ARCH }}
+            type=sha,prefix=next-,suffix=-${{ env.PLATFORM_ARCH }}
           imageLabels: quay.expires-after=14d
           push: true
+          platform: ${{ matrix.platform }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+
+  merge:
+      runs-on: ubuntu-latest
+      needs:
+        - build-image
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
+
+        - name: Download digests
+          uses: actions/download-artifact@v4
+          with:
+            path: /tmp/digests
+            pattern: digests-*
+            merge-multiple: true
+
+        - name: Get the last commit short SHA
+          uses: ./.github/actions/get-sha
+
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
+
+        - name: Docker meta
+          id: meta
+          uses: docker/metadata-action@v5
+          with:
+            images: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}
+            tags: |
+              type=raw,value=next
+              type=ref,prefix=pr-,suffix=-${{ env.SHORT_SHA }},event=pr
+
+        - name: Login to Docker Hub
+          uses: docker/login-action@v3
+          with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ vars.QUAY_USERNAME }}
+            password: ${{ secrets.QUAY_TOKEN }}
+
+        - name: Create manifest list and push
+          working-directory: /tmp/digests
+          run: |
+            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+              $(printf '${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+        - name: Inspect image
+          run: |
+            docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+
+
+
+

.github/workflows/pr-build-image.yaml

@@ -52,16 +52,8 @@ jobs:
           git fetch base-origin ${{ github.event.pull_request.base.ref }}
           git merge --no-edit base-origin/${{ github.event.pull_request.base.ref }}
 
-      - name: Get the last commit short SHA of the PR
-        run: |
-          SHORT_SHA=$(git rev-parse --short=8 ${{ github.event.pull_request.head.sha }})
-          echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV
-          if [[ -f packages/app/src/build-metadata.json ]]; then
-            repoPR="${{ github.repository }}/pull/${{ github.event.number }}"
-            now="$(date -u +%FT%TZ)"
-            sed -i packages/app/src/build-metadata.json -r \
-              -e 's|("Last Commit:.+)|"Last Commit: '$repoPR' @ '$SHORT_SHA'"|'
-          fi
+      - name: Get the last commit short SHA
+        uses: ./.github/actions/get-sha
 
       - name: Build and Push with Buildx
         uses: ./.github/actions/docker-build
@@ -76,6 +68,7 @@ jobs:
           # to autodelete PR image tags, set an expiry date
           imageLabels: quay.expires-after=14d
           push: true
+          platform: linux/amd64
 
       - name: Comment the image pull link
         uses: actions/github-script@v7