CLOUDP-240887: Fix CI signatures

Signed-off-by: jose.vazquez <jose.vazquez@mongodb.com>
mongodb · Apr 3, 2024 · dd62852 · dd62852
1 parent e81c276
commit dd62852
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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')