From 3018c8add1e469be62f7ab8ef107fdb393120d24 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 Sep 2017 11:34:18 +0100 Subject: [PATCH] kubernetes: Add force{tag,push} targets to image-cache build Signed-off-by: Ian Campbell --- projects/kubernetes/image-cache/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/kubernetes/image-cache/Makefile b/projects/kubernetes/image-cache/Makefile index 10ace6084..c094bcc50 100644 --- a/projects/kubernetes/image-cache/Makefile +++ b/projects/kubernetes/image-cache/Makefile @@ -14,17 +14,19 @@ dl/%.tar: ln $(IMAGES) $${builddir} ; \ $(MAKE) -f Makefile.pkg BUILDDIR=$${builddir} CACHE=$(CACHE) $* -.PHONY: tag-common push-common show-tag-common -tag-common push-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES)) +.PHONY: tag-common forcetag-common push-common forcepush-common show-tag-common +tag-common forcetag-common push-common forcepush-common show-tag-common: %-common: $(patsubst %,dl/%.tar,$(COMMON_IMAGES)) @$(MAKE) CACHE=common IMAGES="$^" $*-pkg -.PHONY: tag-control-plane push-control-plane show-tag-control-plane -tag-control-plane push-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES)) +.PHONY: tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane +tag-control-plane forcetag-control-plane push-control-plane forcepush-control-plane show-tag-control-plane: %-control-plane: $(patsubst %,dl/%.tar,$(CONTROL_PLANE_IMAGES)) @$(MAKE) CACHE=control-plane IMAGES="$^" $*-pkg .PHONY: tag push show-tags tag: tag-common tag-control-plane +forcetag: forcetag-common forcetag-control-plane push: push-common push-control-plane +forcepush: forcepush-common forcepush-control-plane show-tags: show-tag-common show-tag-control-plane .PHONY: dl