From addd5912ccb7c3ffb7ba2538a95b8150c5a050b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstro=CC=88m?= <erik@hedenstroem.com>
Date: Fri, 17 Jun 2016 11:50:20 +0200
Subject: [PATCH] Fixed makefile

---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2a9f749..b5ee991 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,12 @@ dialyzer:
 release:
 	@$(REBAR) release
 
-image:
-	@$(REBAR) do tar
-	REL_VSN=$(shell relinfo.escript -vsn _build/default/rel/consul_proxy/releases/RELEASES) envsubst '$$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/default/Dockerfile
-	docker build -t hedenstroem/consul_proxy -f _build/default/Dockerfile _build/default
+tarball:
+	@$(REBAR) as production do tar
+
+image: tarball
+	@REL_VSN=$(shell relinfo.escript -vsn _build/production/rel/consul_proxy/releases/RELEASES) envsubst '$$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/production/Dockerfile
+	@docker build -t erlangninja/consul_proxy -f _build/production/Dockerfile _build/production
 
 edoc:
 	@$(REBAR) edoc
@@ -32,7 +34,7 @@ clean:
 	@$(REBAR) clean
 
 distclean:
-	@rm -rf _build rebar.lock log $(REBAR)
+	@rm -rf _build log $(REBAR)
 
 shell:
 	@$(REBAR) shell --config=config/test-sys.config
-- 
GitLab