From 38c0e81ac02f703be4bbb762b3abad65d76f4cec Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Wed, 9 May 2018 10:52:56 +0200
Subject: [PATCH] consistent Docker image creation

This ensures that Makefile variables and the "push" target behave the
same in driver-registrar, drivers, external-attacher and
external-provisioner.

Related-to: kubernetes-csi/docs#23
---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1899aecca..cbda16470 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,10 @@
 
 .PHONY: all csi-attacher clean test
 
-IMAGE_NAME=quay.io/k8scsi/csi-attacher
+REGISTRY_NAME=quay.io/k8scsi
+IMAGE_NAME=csi-attacher
 IMAGE_VERSION=canary
+IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
 
 REV=$(shell git describe --long --match='v*' --dirty)
 
@@ -36,10 +38,10 @@ clean:
 	-rm -rf bin
 
 container: csi-attacher
-	docker build -t $(IMAGE_NAME):$(IMAGE_VERSION) .
+	docker build -t $(IMAGE_TAG) .
 
 push: container
-	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
+	docker push $(IMAGE_TAG)
 
 test:
 	go test `go list ./... | grep -v 'vendor'` $(TESTARGS)