From 333f648b84e8d57edb5b10609e0a5d04dad5ea59 Mon Sep 17 00:00:00 2001
From: Travis Reeder <treeder@gmail.com>
Date: Tue, 28 Feb 2017 13:19:44 -0800
Subject: [PATCH] Updated makefile docker commands (#545)

* Updated makefile docker commands

* Fix

* rename make target
---
 CONTRIBUTING.md |  4 ++--
 Makefile        | 33 ++++++++++++++++-----------------
 circle.yml      |  2 +-
 release.sh      |  2 +-
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index abef128a1..eec413700 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,7 +57,7 @@ make test
 #### Run in Docker
 
 ```sh
-make run-docker
+make docker-run
 ```
 
 will start IronFunctions inside a Docker container.
@@ -65,7 +65,7 @@ will start IronFunctions inside a Docker container.
 ## Tests in Docker
 
 ```sh
-make test-docker
+make docker-test
 
 ```
 
diff --git a/Makefile b/Makefile
index bd44e13a0..03f2a30c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,12 @@
 # Just builds
 .PHONY: all test dep build
 
-DIR := ${CURDIR}
-
 dep:
 	glide install --strip-vendor
 
 build:
 	go build -o functions
 
-build-docker:
-	set -ex
-	docker run --rm -v $(DIR):/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go build -o functions-alpine
-	docker build -t iron/functions:latest .
-
 test:
 	go test -v $(shell go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn)
 	cd fn && $(MAKE) test
@@ -21,18 +14,24 @@ test:
 test-datastore:
 	cd api/datastore && go test -v
 
-test-docker:
-	docker run -ti --privileged --rm -e LOG_LEVEL=debug \
-	-v /var/run/docker.sock:/var/run/docker.sock \
-	-v $(DIR):/go/src/github.com/iron-io/functions \
-	-w /go/src/github.com/iron-io/functions iron/go:dev go test \
-	-v $(shell go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn | grep -v datastore)
-
 run:
 	./functions
 
-run-docker: build-docker
-	set -ex
-	docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v $(DIR)/data:/app/data -p 8080:8080 iron/functions
+docker-dep:
+	docker run --rm -it -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions treeder/glide install -v
+
+docker-build:
+	docker run --rm -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go build -o functions-alpine
+	docker build -t iron/functions:latest .
+
+docker-run: build-docker
+	docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v ${CURDIR}/data:/app/data -p 8080:8080 iron/functions
+
+docker-test:
+	docker run -ti --privileged --rm -e LOG_LEVEL=debug \
+	-v /var/run/docker.sock:/var/run/docker.sock \
+	-v ${CURDIR}:/go/src/github.com/iron-io/functions \
+	-w /go/src/github.com/iron-io/functions iron/go:dev go test \
+	-v $(shell go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn | grep -v datastore)
 
 all: dep build
diff --git a/circle.yml b/circle.yml
index 3fcc43701..418b63c6e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -29,7 +29,7 @@ dependencies:
 
 test:
   override:
-    - make test-docker:
+    - make docker-test:
         pwd: $GO_PROJECT
     - make test-datastore:
         pwd: $GO_PROJECT
diff --git a/release.sh b/release.sh
index 27b47d331..152ad6be3 100755
--- a/release.sh
+++ b/release.sh
@@ -15,7 +15,7 @@ perl -i -pe 's/\d+\.\d+\.\K(\d+)/$1+1/e' $version_file
 version=$(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file)
 echo "Version: $version"
 
-make build-docker
+make docker-build
 
 sed "s/release=.*/release=\"$version\"/g" fn/install.sh > fn/install.sh.tmp
 mv fn/install.sh.tmp fn/install.sh