Get built image IDs via manifest digests

Signed-off-by: Marcel Bargull <[email protected]>
bioconda · Oct 16, 2023 · 2b5d90d · 2b5d90d
1 parent 7a2e3d6
commit 2b5d90d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml
@@ -93,10 +93,11 @@ jobs:
         image='${{ steps.build.outputs.image }}'
         ids="$(
           for tag in ${{ steps.calculate.outputs.tags }} ; do
-            buildah images --quiet --no-trunc "${image}:${tag}"
-          done
+            buildah manifest inspect "${image}:${tag}" \
+              | jq -r '.manifests[]|.digest' \
+              | xargs -I'{}' buildah images --quiet --filter=digest='{}'
+          done | sort -u
           )"
-        ids="$( printf %s "${ids}" | sort -u )"
         for id in ${ids} ; do
           podman history "${id}"
           buildah bud \
@@ -150,16 +151,17 @@ jobs:
       name: Test Pushed
       run: |
         image='${{ env.IMAGE_NAME }}'
-        digests="$(
+        ids="$(
           for tag in ${{ steps.calculate.outputs.tags }} ; do
             buildah manifest inspect "${image}:${tag}" \
-              | jq -r '.manifests[]|.digest'
+              | jq -r '.manifests[]|.digest' \
+              | xargs -I'{}' buildah images --quiet --filter=digest='{}'
           done | sort -u
           )"
-        for digest in ${digests} ; do
-          podman history "${image}@${digest}"
+        for id in ${ids} ; do
+          podman history "${id}"
           buildah bud \
-            --build-arg=base="${image}@${digest}" \
+            --build-arg=base="${id}" \
             --file=Dockerfile.test \
             "images/${image}"
         done

diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml
@@ -78,21 +78,22 @@ jobs:
         build-args: |
           debian_version=${{ env.DEBIAN_VERSION }}
         containerfiles: |
-            ./images/${{ env.IMAGE_NAME }}/Dockerfile
+          ./images/${{ env.IMAGE_NAME }}/Dockerfile
 
     - name: Test
       run: |
         image='${{ steps.build.outputs.image }}'
-        digests="$(
+        ids="$(
           for tag in ${{ steps.calculate.outputs.tags }} ; do
             buildah manifest inspect "${image}:${tag}" \
-              | jq -r '.manifests[]|.digest'
+              | jq -r '.manifests[]|.digest' \
+              | xargs -I'{}' buildah images --quiet --filter=digest='{}'
           done | sort -u
           )"
-        for digest in ${digests} ; do
-          podman history "${image}@${digest}"
+        for id in ${ids} ; do
+          podman history "${id}"
           buildah bud \
-            --build-arg=base="${image}@${digest}" \
+            --build-arg=base="${id}" \
             --file=Dockerfile.test \
             "images/${image}"
         done
@@ -144,10 +145,11 @@ jobs:
         image='${{ env.IMAGE_NAME }}'
         ids="$(
           for tag in ${{ steps.calculate.outputs.tags }} ; do
-            buildah images --quiet --no-trunc "${image}:${tag}"
-          done
+            buildah manifest inspect "${image}:${tag}" \
+              | jq -r '.manifests[]|.digest' \
+              | xargs -I'{}' buildah images --quiet --filter=digest='{}'
+          done | sort -u
           )"
-        ids="$( printf %s "${ids}" | sort -u )"
         for id in ${ids} ; do
           podman history "${id}"
           buildah bud \