From 177b45c49b9c135582796161db3127b10106a7d5 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <github@psudo.net>
Date: Tue, 17 Jan 2017 11:06:53 -0800
Subject: [PATCH] use common.mk for common make variables. use -e when calling
 make. use golang:1.7.4 image.

---
 Makefile              | 9 ++++-----
 common.mk             | 4 ++++
 plugins/repo/Makefile | 5 +----
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 common.mk

diff --git a/Makefile b/Makefile
index 92be131e8..0500a603c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,6 @@ DOKKU_LIB_ROOT ?= /var/lib/dokku
 PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/plugins
 CORE_PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/core-plugins
 
-export GO_REPO_ROOT := /go/src/github.com/dokku/dokku
-export BUILD_IMAGE := golang:1.7.1
-
 # If the first argument is "vagrant-dokku"...
 ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
   # use the rest as arguments for "vagrant-dokku"
@@ -26,6 +23,8 @@ else
 	BUILD_STACK_TARGETS = build-in-docker
 endif
 
+include common.mk
+
 .PHONY: all apt-update install version copyfiles man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
 
 include tests.mk
@@ -57,7 +56,7 @@ go-build:
 	basedir=$(PWD); \
 	for dir in plugins/*; do \
 		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir || exit $$? ;\
+			$(MAKE) -e -C $$dir || exit $$? ;\
 		fi ;\
 	done
 
@@ -65,7 +64,7 @@ go-clean:
 	basedir=$(PWD); \
 	for dir in plugins/*; do \
 		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir clean ;\
+			$(MAKE) -e -C $$dir clean ;\
 		fi ;\
 	done
 
diff --git a/common.mk b/common.mk
new file mode 100644
index 000000000..0b04d1362
--- /dev/null
+++ b/common.mk
@@ -0,0 +1,4 @@
+GO_REPO_ROOT := /go/src/github.com/dokku/dokku
+BUILD_IMAGE := golang:1.7.4
+
+.PHONY: build-in-docker build clean
diff --git a/plugins/repo/Makefile b/plugins/repo/Makefile
index 6883702d6..e712344ac 100644
--- a/plugins/repo/Makefile
+++ b/plugins/repo/Makefile
@@ -1,7 +1,4 @@
-.PHONY: build-in-docker build clean
-
-GO_REPO_ROOT ?= /go/src/github.com/dokku/dokku
-BUILD_IMAGE ?= golang:1.7.1
+include ../../common.mk
 
 build-in-docker: clean
 	docker run --rm \