Skip to content

Commit 4baf4b3

Browse files
authored
CLOUDP-355439: Fix signing transparency log error (#2843)
* CLOUDP-355439: Fix signing transparency log error * Fix transparencly log error Signed-off-by: jose.vazquez <[email protected]> --------- Signed-off-by: jose.vazquez <[email protected]>
1 parent 7979320 commit 4baf4b3

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

.github/workflows/rebuild-released-images.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ jobs:
222222
GRS_PASSWORD: ${{ secrets.GRS_PASSWORD }}
223223
run: |
224224
make sign IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}
225-
make sign IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}
225+
make sign IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO="quay.io/${{ env.IMAGE_REPOSITORY }}"
226226
make sign IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=mongodb/signatures
227227
228228
- name: Self-verify images (Non Devbox)
@@ -233,7 +233,7 @@ jobs:
233233
GRS_PASSWORD: ${{ secrets.GRS_PASSWORD }}
234234
run: |
235235
make verify IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}
236-
make verify IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}
236+
make verify IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO="quay.io/${{ env.IMAGE_REPOSITORY }}"
237237
make verify IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=mongodb/signatures
238238
239239
- name: Sign images (Devbox)
@@ -244,7 +244,7 @@ jobs:
244244
GRS_PASSWORD: ${{ secrets.GRS_PASSWORD }}
245245
run: |
246246
devbox run -- 'make sign IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}'
247-
devbox run -- 'make sign IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}'
247+
devbox run -- 'make sign IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO="quay.io/${{ env.IMAGE_REPOSITORY }}"'
248248
devbox run -- 'make sign IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=mongodb/signatures'
249249
250250
- name: Self-verify images (Devbox)
@@ -255,6 +255,6 @@ jobs:
255255
GRS_PASSWORD: ${{ secrets.GRS_PASSWORD }}
256256
run: |
257257
devbox run -- 'make verify IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}'
258-
devbox run -- 'make verify IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=${{ env.IMAGE_REPOSITORY }}'
258+
devbox run -- 'make verify IMG="quay.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO="quay.io/${{ env.IMAGE_REPOSITORY }}"'
259259
devbox run -- 'make verify IMG="${{ env.IMAGE_REPOSITORY }}:${{ steps.daily-tag.outputs.daily-tag }}" SIGNATURE_REPO=mongodb/signatures'
260260

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,16 +523,16 @@ endif
523523
.PHONY: sign
524524
sign: ## Sign an AKO multi-architecture image
525525
@echo "Signing multi-architecture image $(IMG)..."
526-
IMG=$(IMG) SIGNATURE_REPO=$(SIGNATURE_REPO) ./scripts/sign-multiarch.sh
526+
@IMG=$(IMG) SIGNATURE_REPO=$(SIGNATURE_REPO) ./scripts/sign-multiarch.sh
527527

528528
./ako.pem:
529529
curl $(AKO_SIGN_PUBKEY) > $@
530530

531531
.PHONY: verify
532532
verify: ./ako.pem ## Verify an AKO multi-architecture image's signature
533533
@echo "Verifying multi-architecture image signature $(IMG)..."
534-
IMG=$(IMG) SIGNATURE_REPO=$(SIGNATURE_REPO) \
535-
./scripts/sign-multiarch.sh verify && echo "VERIFIED OK"
534+
@IMG=$(IMG) SIGNATURE_REPO=$(SIGNATURE_REPO) \
535+
./scripts/sign-multiarch.sh verify
536536

537537
.PHONY: helm-upd-crds
538538
helm-upd-crds:

scripts/sign-multiarch.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,9 @@ for platform_sha in ${IMG_PLATFORMS_SHAS}; do
3434
echo "${action} platform image ${img}@${platform_sha}..."
3535
IMG="${img}@${platform_sha}" "${SCRIPT_DIR}/${action}.sh"
3636
done
37+
38+
msg="All signed"
39+
if [ "${action}" == "verify" ]; then
40+
msg="All verified OK"
41+
fi
42+
echo "${msg}"

scripts/sign.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ docker run \
4545
-v "$(pwd):$(pwd)" \
4646
-w "$(pwd)" \
4747
artifactory.corp.mongodb.com/release-tools-container-registry-local/garasign-cosign \
48-
cosign sign --key "${PKCS11_URI}" --tlog-upload=false "${img}"
48+
cosign sign --key "${PKCS11_URI}" \
49+
--tlog-upload=false --use-signing-config=false --new-bundle-format=false "${img}" && \
50+
echo "✍️ Signed"

scripts/verify.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
2525
KEY_FILE=${KEY_FILE:-ako.pem}
2626

2727
COSIGN_REPOSITORY="${SIGNATURE_REPO}" "${SCRIPT_DIR}"/retry.sh cosign verify \
28-
--insecure-ignore-tlog --key="${KEY_FILE}" "${img_to_verify}"
28+
--insecure-ignore-tlog --key="${KEY_FILE}" "${img_to_verify}" && echo "✅ Signature OK"

0 commit comments

Comments
 (0)