A continuation of HomeBox the inventory and organization system built for the Home User
Fix merge digest for other docker images
Matthew Kilgore3671ba2ba1bb
diff --git a/.github/workflows/docker-publish-rootless.yaml b/.github/workflows/docker-publish-rootless.yamlindex 29efc9a3..ad335e25 100644--- a/.github/workflows/docker-publish-rootless.yaml+++ b/.github/workflows/docker-publish-rootless.yaml@@ -206,8 +206,16 @@ jobs:id: push-ghcrworking-directory: /tmp/digestsrun: |+ set -euo pipefaildocker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \- $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)+ $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-ghcr.out+ digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-ghcr.out | head -n1 || true)+ if [ -z "$digest" ]; then+ echo "No digest found in imagetools output:"+ cat /tmp/push-ghcr.out+ exit 1+ fi+ echo "digest=$digest" >> $GITHUB_OUTPUT- name: Attest GHCR imagesuses: actions/attest-build-provenance@v1@@ -222,8 +230,16 @@ jobs:working-directory: /tmp/digestsif: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))run: |+ set -euo pipefaildocker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \- $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)+ $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-dockerhub.out+ digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-dockerhub.out | head -n1 || true)+ if [ -z "$digest" ]; then+ echo "No digest found in imagetools output:"+ cat /tmp/push-dockerhub.out+ exit 1+ fi+ echo "digest=$digest" >> $GITHUB_OUTPUT- name: Attest Dockerhub imagesuses: actions/attest-build-provenance@v1diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yamlindex 5a2d177b..710761e8 100644--- a/.github/workflows/docker-publish.yaml+++ b/.github/workflows/docker-publish.yaml@@ -197,8 +197,16 @@ jobs:id: push-ghcrworking-directory: /tmp/digestsrun: |+ set -euo pipefaildocker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \- $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)+ $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-ghcr.out+ digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-ghcr.out | head -n1 || true)+ if [ -z "$digest" ]; then+ echo "No digest found in imagetools output:"+ cat /tmp/push-ghcr.out+ exit 1+ fi+ echo "digest=$digest" >> $GITHUB_OUTPUT- name: Attest GHCR imagesuses: actions/attest-build-provenance@v1@@ -213,8 +221,16 @@ jobs:working-directory: /tmp/digestsif: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))run: |+ set -euo pipefaildocker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \- $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)+ $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-dockerhub.out+ digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-dockerhub.out | head -n1 || true)+ if [ -z "$digest" ]; then+ echo "No digest found in imagetools output:"+ cat /tmp/push-dockerhub.out+ exit 1+ fi+ echo "digest=$digest" >> $GITHUB_OUTPUT- name: Attest Dockerhub imagesuses: actions/attest-build-provenance@v1