From 3906b6d83886a35c18cc3011490a4b7f071a507a Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Mon, 10 Sep 2018 18:51:14 +0200
Subject: [PATCH] Fragmentize makefile's docker image building

---
 Makefile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 8fc30b198..faec3ed84 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ GO        = go
 GOGET     = $(GO) get -u
 
 BASEPKGS = rbac auth crm sam
+IMAGES   = auth crm sam
 
 ########################################################################################################################
 # Tool bins
@@ -33,15 +34,17 @@ nothing:
 	@echo - qa - run vet, critic and test on code
 	@echo
 
-docker:
-	docker build --no-cache --rm --build-arg APP=sam -f docker/Dockerfile -t crusttech/sam .
-	docker build --no-cache --rm --build-arg APP=crm -f docker/Dockerfile -t crusttech/crm .
-	docker build --no-cache --rm --build-arg APP=auth -f docker/Dockerfile -t crusttech/auth .
 
-docker-push:
-	docker push crusttech/sam
-	docker push crusttech/crm
-	docker push crusttech/auth
+docker: $(IMAGES:%=docker-image.%)
+
+docker-image.%: %
+	@ docker build --no-cache --rm --build-arg APP=$^  -f docker/Dockerfile -t crusttech/$^ .
+
+docker-push: $(IMAGES:%=docker-push.%)
+
+docker-push.%: %
+	@ docker push crusttech/$^
+
 
 ########################################################################################################################
 # Development