mirror of
https://github.com/dokku/dokku.git
synced 2025-12-16 12:07:45 +01:00
use common.mk for common make variables. use -e when calling make. use golang:1.7.4 image.
This commit is contained in:
9
Makefile
9
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
|
||||
|
||||
|
||||
4
common.mk
Normal file
4
common.mk
Normal file
@@ -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
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user