From 76cccfaabd052a75245d1f9be95ee60f563a8a0e Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 4 Dec 2017 17:37:50 -0600
Subject: [PATCH] get_vendor_deps does not require all the tools

- remove revision cmd
- rename ensure_tools to tools
---
 Makefile               | 25 ++++++++++++-------------
 test/docker/Dockerfile |  1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index bf334994..d74bf0ec 100644
--- a/Makefile
+++ b/Makefile
@@ -60,25 +60,24 @@ get_deps:
 		grep -v /vendor/ | sort | uniq | \
 		xargs go get -v -d
 
-get_vendor_deps: ensure_tools
+update_deps:
+	@echo "--> Updating dependencies"
+	@go get -d -u ./...
+
+get_vendor_deps:
+	@hash glide 2>/dev/null || go get github.com/Masterminds/glide
 	@rm -rf vendor/
 	@echo "--> Running glide install"
 	@glide install
 
-update_deps: tools
-	@echo "--> Updating dependencies"
-	@go get -d -u ./...
-
-revision:
-	-echo `git rev-parse --verify HEAD` > $(TMHOME)/revision
-	-echo `git rev-parse --verify HEAD` >> $(TMHOME)/revision_history
+update_tools:
+	@echo "--> Updating tools"
+	@go get -u $(GOTOOLS)
 
 tools:
-	go get -u -v $(GOTOOLS)
-
-ensure_tools:
-	go get $(GOTOOLS)
-	test -f gometalinter & gometalinter --install
+	@echo "--> Installing tools"
+	@go get $(GOTOOLS)
+	@gometalinter --install
 
 ### Formatting, linting, and vetting
 
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index dcdb404b..4e98ecc7 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -17,6 +17,7 @@ WORKDIR $REPO
 ADD glide.yaml glide.yaml
 ADD glide.lock glide.lock
 ADD Makefile Makefile
+RUN make tools
 RUN make get_vendor_deps
 
 # Install the apps