From 5aa1003ff0917a9b57ac0251f5fbc8082b342d6d Mon Sep 17 00:00:00 2001
From: ebosas <ebosas@gmail.com>
Date: Mon, 1 Nov 2021 17:09:23 +0200
Subject: [PATCH] Simplify Makefile

---
 Makefile | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 74c0f4d..29597c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,21 @@
 # This makefile creates service images and pushes them to ECR
 
-project = microservices
-services = server cache database backend
-registry = 123456789012.dkr.ecr.us-west-1.amazonaws.com # change registry
+registry = <aws_account_id>.dkr.ecr.<region>.amazonaws.com # insert your registry
 version ?= latest
 
-ecr: ecr-build ecr-publish
+ecr: build tag push
 
-ecr-build:
-	for service in ${services} ; do \
-		docker build -t ${project}/$$service:${version} -f $$service.Dockerfile . ; \
-	done
+build:
+	docker build -t microservices/server:${version} -f server.Dockerfile .
+	docker build -t microservices/cache:${version} -f cache.Dockerfile .
+	docker build -t microservices/database:${version} -f database.Dockerfile .
 
-ecr-publish:
-	for service in ${services} ; do \
-		docker tag ${project}/$$service:latest ${registry}/${project}/$$service:${version} ; \
-		docker push ${registry}/${project}/$$service:${version} ; \
-	done
+tag:
+	docker tag microservices/server:latest ${registry}/microservices/server:${version}
+	docker tag microservices/cache:latest ${registry}/microservices/cache:${version}
+	docker tag microservices/database:latest ${registry}/microservices/database:${version}
+
+push:
+	docker push ${registry}/microservices/server:${version}
+	docker push ${registry}/microservices/cache:${version}
+	docker push ${registry}/microservices/database:${version}