github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

switch pause to docker manifest instead of manifest-tool

Browse Source
This commit is contained in:
Benjamin Elder 2020-02-13 14:53:19 -08:00
parent 4bb8df4464
commit 20b1597302
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/pause/Makefile
View File

@ -14,8 +14,6 @@
.PHONY: all push container clean orphan all-push push-manifest .PHONY: all push container clean orphan all-push push-manifest
include ../../hack/make-rules/Makefile.manifest
REGISTRY ?= staging-k8s.gcr.io REGISTRY ?= staging-k8s.gcr.io
IMAGE = $(REGISTRY)/pause IMAGE = $(REGISTRY)/pause
IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH) IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)
@ -60,8 +58,10 @@ all: all-container
all-push: all-push-images push-manifest all-push: all-push-images push-manifest
push-manifest: manifest-tool push-manifest:
manifest-tool push from-args --platforms $(call join_platforms,$(ALL_ARCH)) --template $(IMAGE)-ARCH:$(TAG) --target $(IMAGE):$(TAG) docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
set -x; for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
docker manifest push --purge ${IMAGE}:${TAG}
sub-container-%: sub-container-%:
$(MAKE) ARCH=$* container $(MAKE) ARCH=$* container