From dd6285281f53780ce940387e238209b9df4e4fd3 Mon Sep 17 00:00:00 2001 From: "jose.vazquez" Date: Wed, 3 Apr 2024 11:50:45 +0200 Subject: [PATCH] CLOUDP-240887: Fix CI signatures Signed-off-by: jose.vazquez --- Makefile | 2 +- scripts/sign-multiarch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 475a4d605d..a0aa24d05f 100644 --- a/Makefile +++ b/Makefile @@ -464,7 +464,7 @@ sign: ## Sign an AKO multi-architecture image IMG=$(IMG) SIGNATURE_REPO=$(SIGNATURE_REPO) ./scripts/sign-multiarch.sh cosign: - @which cosign || go install github.com/sigstore/cosign/cmd/cosign@latest + @which cosign || go install github.com/sigstore/cosign/v2/cmd/cosign@latest ./ako.pem: curl $(AKO_SIGN_PUBKEY) > $@ diff --git a/scripts/sign-multiarch.sh b/scripts/sign-multiarch.sh index 75c3f97b06..b96ce6199b 100755 --- a/scripts/sign-multiarch.sh +++ b/scripts/sign-multiarch.sh @@ -9,7 +9,7 @@ action=${1:-sign} SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) docker pull "${img}" -MULTIARCH_IMG_SHA=$(docker inspect "${img}" |jq -rc '.[0].Id') +MULTIARCH_IMG_SHA=$(docker inspect --format='{{index .RepoDigests 0}}' "${img}" |awk -F@ '{print $2}') IMG_PLATFORMS_SHAS=$(docker manifest inspect "${img}" | \ jq -rc '.manifests[] | select(.platform.os != "unknown" and .platform.architecture != "unknown") | .digest')