From e6b44539a50e50481ee768413ff535adc435714e Mon Sep 17 00:00:00 2001
From: Nolan Brubaker <nolan@heptio.com>
Date: Mon, 10 Sep 2018 16:42:04 -0400
Subject: [PATCH] Make fsfreeze image building consistent

Due to the version of docker used to build images, the Dockerfile used
with -f must be in the same directory that's used for the context. Copy
the Dockerfile into the _output directory and make the custom targets
more closely match the standard ones.

Fixes #833

Signed-off-by: Nolan Brubaker <nolan@heptio.com>
---
 Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 35310a05b0..a7353feac8 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ endif
 #		DOCKERFILE ?= Dockerfile.arm64 #aarch64/busybox
 #endif
 
-IMAGE := $(REGISTRY)/$(BIN)
+IMAGE = $(REGISTRY)/$(BIN)
 
 # If you want to build all binaries, see the 'all-build' rule.
 # If you want to build all containers, see the 'all-container' rule.
@@ -129,17 +129,21 @@ shell: build-dirs build-image
 
 DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION))
 
+# Use a slightly customized build/push targets since we don't have a Go binary to build for the fsfreeze image
+build-fsfreeze: BIN = fsfreeze-pause
 build-fsfreeze:
-	@docker build -t $(REGISTRY)/fsfreeze-pause:$(VERSION) -f Dockerfile-fsfreeze-pause.alpine _output
-	@docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > $@
+	@cp $(DOCKERFILE)  _output/.dockerfile-$(BIN).alpine
+	@docker build -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN).alpine _output
+	@docker images -q $(IMAGE):$(VERSION) > .container-$(DOTFILE_IMAGE)
 
+push-fsfreeze: BIN = fsfreeze-pause
 push-fsfreeze:
-	@docker push $(REGISTRY)/fsfreeze-pause:$(VERSION)
+	@docker push $(IMAGE):$(VERSION)
 ifeq ($(TAG_LATEST), true)
-	docker tag $(REGISTRY)/fsfreeze-pause:$(VERSION) $(IMAGE):latest
-	docker push $(REGISTRY)/fsfreeze-pause:latest
+	docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
+	docker push $(IMAGE):latest
 endif
-	@docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > $@
+	@docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > .container-$(DOTFILE_IMAGE)
 
 all-containers:
 	$(MAKE) container