build and release fix

Author: David Zuckerman

.github/workflows/build.yml

@@ -15,16 +15,16 @@ jobs:
   build:
     runs-on: ${{ matrix.runner }}
     outputs:
-      image-arm64: ${{ steps.gen-output.outputs.image-arm64 }}
-      image-x64: ${{ steps.gen-output.outputs.image-x64 }}
+      build-image-arm: ${{ steps.gen-output.outputs.image-arm64 }}
+      build-image-x64: ${{ steps.gen-output.outputs.image-x64 }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - platform: linux/amd64
+            runner: ubuntu-24.04
+          - platform: linux/arm64
             runner: ubuntu-24.04-arm
-          - platform: linux/arm64 
-            runner: ubuntu-24.04-arm 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -40,15 +40,15 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - id: build-meta
-        name: Docker meta
+        name: Produce the build image tag
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
           tags: type=sha,suffix=${{ env.BUILD_SUFFIX }}
 
       # Build cache is shared among all builds of the same architecture
       - id: cache-meta
-        name: Docker meta
+        name: Fetch build cache metadata
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
@@ -59,11 +59,22 @@ jobs:
         run: |
           echo "registry=$(echo '${{ steps.build-meta.outputs.tags }}' | cut -f1 -d:)" | tee -a "$GITHUB_OUTPUT"
 
+      - id: set_build_url
+        name: Set BUILD_URL
+        run: |
+          echo "build_url=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" | tee -a "$GITHUB_OUTPUT"
+
       - id: build
         name: Build/push the arch-specific image
         uses: docker/build-push-action@v6
         with:
           platforms: ${{ matrix.platform }}
+          build-args: |
+            BUILD_TIMESTAMP=${{ github.event.repository.updated_at }}
+            BUILD_URL=${{ steps.set_build_url.outputs.build_url }}
+            GIT_REF_NAME=${{ github.ref_name }}
+            GIT_SHA=${{ github.sha }}
+            GIT_REPOSITORY_URL=${{ github.repositoryUrl }}
           cache-from: type=registry,ref=${{ steps.cache-meta.outputs.tags }}
           cache-to: type=registry,ref=${{ steps.cache-meta.outputs.tags }},mode=max
           labels: ${{ steps.build-meta.outputs.labels }}
@@ -78,11 +89,12 @@ jobs:
           echo "image-${RUNNER_ARCH,,}=${{ steps.get-registry.outputs.registry }}@${{ steps.build.outputs.digest }}" | tee -a "$GITHUB_OUTPUT"
 
   merge:
-    runs-on: ubuntu-24.04
-    needs: build
+    runs-on: ubuntu-latest
+    needs:
+      - build
     env:
-      DOCKER_APP_IMAGE_ARM64: ${{ needs.build.outputs.image-arm64 }}
-      DOCKER_APP_IMAGE_X64: ${{ needs.build.outputs.image-x64 }}
+      DOCKER_APP_IMAGE_ARM64: ${{ needs.build.outputs.build-image-arm }}
+      DOCKER_APP_IMAGE_X64: ${{ needs.build.outputs.build-image-x64 }}
     outputs:
       build-image: ${{ steps.meta.outputs.tags }}
       build-image-arm: ${{ needs.build.outputs.build-image-arm }}
@@ -101,14 +113,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - id: meta
-        name: Generate tag for the app image
+      - name: Docker meta
+        id: meta
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
-          tags: type=sha,suffix=${{ env.BUILD_SUFFIX }}
+          tags: |
+            type=sha,suffix=-build-${{ github.run_id }}_${{ github.run_attempt }}
 
-      - name: Push the multi-platform app image
+      - name: Push the multi-platform image
         run: |
           docker buildx imagetools create \
             --tag "$DOCKER_METADATA_OUTPUT_TAGS" \
@@ -174,6 +187,8 @@ jobs:
       - test
     env:
       DOCKER_APP_IMAGE: ${{ needs.merge.outputs.build-image }}
+      DOCKER_APP_IMAGE_ARM64: ${{ needs.merge.outputs.build-image-arm }}
+      DOCKER_APP_IMAGE_X64: ${{ needs.merge.outputs.build-image-x64 }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -189,6 +204,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Produce permanent image tags
+        id: branch-meta
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
         env:
           BASE_IMAGE: ${{ steps.get-base-image.outputs.tags }}
         run: |
-          docker pull "$BASE_IMAGE"
+          docker manifest inspect "$BASE_IMAGE"
 
       - name: Produce release tags
         id: tag-meta