rik/docker-deployment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move local configration to config.mk

Browse Source
This commit is contained in:
Rik Veenboer
2017-06-14 11:22:54 +01:00
parent 749cc534b5
commit 73315cff8b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
/config.mk
/*.sh /*.sh
/build/tmp.* /build/tmp.*
/build/parts/* /build/parts/*

6
build/Makefile
View File

@@ -1,10 +1,12 @@
FROM = debian:jessie FROM = debian:jessie
MODE = minimal MODE = minimal
PROXY = $(shell ifconfig eth0 | grep 'inet' | cut -d: -f2 | awk '{ print $2}') PROXY = $(shell hostname -i)
TIMEZONE = Europe/London TIMEZONE = Europe/London
JOBS = 2 JOBS = 2
CLEANUP = true CLEANUP = true
ARGS = --rm=false --no-cache=false ARGS = --rm=false --no-cache=false
include $(wildcard $(DOCKER_HOME)/config.mk)
include $(wildcard $(DOCKER_HOME)/build/make/*.mk) include $(wildcard $(DOCKER_HOME)/build/make/*.mk)
define add define add
@@ -69,7 +71,7 @@ endif
$(call script,prepare) $(call script,prepare)
clean: clean:
# @rm -rf $(DOCKER_HOME)/build/parts @rm -rf $(DOCKER_HOME)/build/parts
@rm -f ${FILE} @rm -f ${FILE}
@rm -rf build @rm -rf build
@rm -rf id_rsa @rm -rf id_rsa