From db0aaee57f125d1c67d9f46b68fe3cebaeba59e5 Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Thu, 27 Sep 2018 18:58:16 +0530 Subject: [PATCH] Purge the manifest after the push --- build/debian-base/Makefile | 2 +- build/debian-hyperkube-base/Makefile | 2 +- build/debian-iptables/Makefile | 2 +- cluster/images/etcd/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index 379fa49196..208f8e801f 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -65,7 +65,7 @@ all-push: all-push-images push-manifest push-manifest: docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g") @for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done - docker manifest push ${IMAGE}:${TAG} + docker manifest push --purge ${IMAGE}:${TAG} build: clean cp ./* $(TEMP_DIR) diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 4a67da27a0..41d6c00290 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -52,7 +52,7 @@ all-push: all-push-images push-manifest push-manifest: docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g") @for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done - docker manifest push ${IMAGE}:${TAG} + docker manifest push --purge ${IMAGE}:${TAG} cni-tars/$(CNI_TARBALL): mkdir -p cni-tars/ diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 8c793db5aa..36aa7f15b8 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -55,6 +55,6 @@ all-push: all-push-images push-manifest push-manifest: docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g") @for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done - docker manifest push ${IMAGE}:${TAG} + docker manifest push --purge ${IMAGE}:${TAG} all: all-push diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 8a2f1ba873..0aa2836291 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -142,7 +142,7 @@ all-push: all-push-images push-manifest push-manifest: docker manifest create --amend $(MANIFEST_IMAGE):$(IMAGE_TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(MANIFEST_IMAGE)\-&:$(IMAGE_TAG)~g") @for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${MANIFEST_IMAGE}:${IMAGE_TAG} ${MANIFEST_IMAGE}-$${arch}:${IMAGE_TAG}; done - docker manifest push ${MANIFEST_IMAGE}:${IMAGE_TAG} + docker manifest push --purge ${MANIFEST_IMAGE}:${IMAGE_TAG} unit-test: docker run --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \