From 8492c28e776a3c00d67ad06deb3abb11a3b31a99 Mon Sep 17 00:00:00 2001 From: Gustavo Fernandes de Carvalho Date: Tue, 29 Nov 2022 19:50:11 -0300 Subject: [PATCH] Fixing release pipeline for boringssl (#1763) Signed-off-by: Gustavo Carvalho --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 18423ff48..7fa10a5d4 100644 --- a/Makefile +++ b/Makefile @@ -236,12 +236,12 @@ SOURCE_TAG ?= $(VERSION)$(TAG_SUFFIX) docker.promote: ## Promote the docker image to the registry @$(INFO) promoting $(SOURCE_TAG) to $(RELEASE_TAG) - docker manifest inspect $(IMAGE_NAME):$(SOURCE_TAG) > .tagmanifest - for digest in $$(jq -r '.manifests[].digest' < .tagmanifest); do \ + docker manifest inspect --verbose $(IMAGE_NAME):$(SOURCE_TAG) > .tagmanifest + for digest in $$(jq -r 'if type=="array" then .[].Descriptor.digest else .Descriptor.digest end' < .tagmanifest); do \ docker pull $(IMAGE_NAME)@$$digest; \ done docker manifest create $(IMAGE_NAME):$(RELEASE_TAG) \ - $$(jq -j '"--amend $(IMAGE_NAME)@" + .manifests[].digest + " "' < .tagmanifest) + $$(jq -j '"--amend $(IMAGE_NAME)@" + if type=="array" then .[].Descriptor.digest else .Descriptor.digest end + " "' < .tagmanifest) docker manifest push $(IMAGE_NAME):$(RELEASE_TAG) @$(OK) docker push $(RELEASE_TAG) \