diff --git a/.gitignore b/.gitignore index 3a582e6..8bc5fb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/config.mk /*.sh /build/tmp.* /build/parts/* \ No newline at end of file diff --git a/build/Makefile b/build/Makefile index 372fdee..f5d8476 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,10 +1,12 @@ FROM = debian:jessie MODE = minimal -PROXY = $(shell ifconfig eth0 | grep 'inet' | cut -d: -f2 | awk '{ print $2}') +PROXY = $(shell hostname -i) TIMEZONE = Europe/London JOBS = 2 CLEANUP = true ARGS = --rm=false --no-cache=false + +include $(wildcard $(DOCKER_HOME)/config.mk) include $(wildcard $(DOCKER_HOME)/build/make/*.mk) define add @@ -69,7 +71,7 @@ endif $(call script,prepare) clean: - # @rm -rf $(DOCKER_HOME)/build/parts + @rm -rf $(DOCKER_HOME)/build/parts @rm -f ${FILE} @rm -rf build @rm -rf id_rsa