ci(image): adjust for lost amd64

Author: grieve54706

.github/workflows/build-image.yml

@@ -7,6 +7,9 @@ on:
         type: string
         description: Docker image tag name (Optional)
 
+env:
+  IBIS_IMAGE: ghcr.io/canner/wren-engine-ibis
+
 jobs:
   prepare-tag:
     runs-on: ubuntu-latest
@@ -69,18 +72,26 @@ jobs:
           build-args: |
             WREN_VERSION=${{ steps.prepare.outputs.WREN_VERSION }}
           push: true
-  build-ibis-amd64-image:
+  build-ibis-image:
     needs: prepare-tag
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     steps:
+      - name: Prepare platform
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/canner/wren-engine-ibis
-          tags: |
-            type=raw,value=${{ needs.prepare-tag.outputs.tag_name }}
+          images: ${{ env.IBIS_IMAGE }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -91,26 +102,46 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Build and push
-        uses: docker/build-push-action@v5
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
         with:
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
           context: ./ibis-server
           build-contexts: |
             wren-core-py=./wren-core-py
             wren-core=./wren-core
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-  build-ibis-arm64-image:
-    needs: prepare-tag
+          outputs: type=image,name=${{ env.IBIS_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+      - 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-ibis-image
     steps:
-      - uses: actions/checkout@v4
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/canner/wren-engine-ibis
+          images: ${{ env.IBIS_IMAGE }}
           tags: |
             type=raw,value=${{ needs.prepare-tag.outputs.tag_name }}
       - name: Login to GitHub Container Registry
@@ -119,17 +150,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: ./ibis-server
-          build-contexts: |
-            wren-core-py=./wren-core-py
-            wren-core=./wren-core
-          platforms: linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
+      - 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.IBIS_IMAGE }}@sha256:%s ' *) \
+            --tag ${{ env.IBIS_IMAGE }}:${{ steps.meta.outputs.tags }}
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.IBIS_IMAGE }}:${{ steps.meta.outputs.tags }}