From 083433dc0f60852d4f268b915306d095799a6d1a Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 11 Aug 2015 14:07:35 -0400
Subject: Updating dockerfiles to allow for previewing of latest master and
 fixing local docker build so it works on osx

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 30babfa39..915eb4cea 100644
--- a/Makefile
+++ b/Makefile
@@ -245,10 +245,8 @@ dist: install
 
 	tar -C dist -czf $(DIST_PATH).tar.gz mattermost
 
-docker-build: stop dist
-	cp $(DIST_PATH).tar.gz docker/dev
-	cd docker/dev && docker build -t ${DOCKERNAME} .
-	rm docker/dev/mattermost.tar.gz
+docker-build: stop
+	docker build -t ${DOCKERNAME} -f docker/local/Dockerfile .
 
 docker-run: docker-build
 	docker run --name ${DOCKER_CONTAINER_NAME} -d --publish 8065:80 ${DOCKERNAME}
-- 
cgit v1.2.3-1-g7c22