Преглед изворни кода

Fixing release pipeline for boringssl (#1763)

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>
Gustavo Fernandes de Carvalho пре 3 година
родитељ
комит
8492c28e77
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      Makefile

+ 3 - 3
Makefile

@@ -236,12 +236,12 @@ SOURCE_TAG ?= $(VERSION)$(TAG_SUFFIX)
 
 
 docker.promote: ## Promote the docker image to the registry
 docker.promote: ## Promote the docker image to the registry
 	@$(INFO) promoting $(SOURCE_TAG) to $(RELEASE_TAG)
 	@$(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; \
 		docker pull $(IMAGE_NAME)@$$digest; \
 	done
 	done
 	docker manifest create $(IMAGE_NAME):$(RELEASE_TAG) \
 	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)
 	docker manifest push $(IMAGE_NAME):$(RELEASE_TAG)
 	@$(OK) docker push $(RELEASE_TAG) \
 	@$(OK) docker push $(RELEASE_TAG) \