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

Add option to set timezone

Browse Source
This commit is contained in:
Rik Veenboer
2016-05-01 13:49:12 +01:00
parent 0111d70d9c
commit c27be0b0e2
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build/Makefile
View File

@@ -1,9 +1,10 @@
TMP = /build/tmp TMP = /build/tmp
FROM = debian:jessie FROM = debian:jessie
MODE = minimal MODE = minimal
ARGS = --rm=false --no-cache=false
PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1) PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1)
TIMEZONE = Europe/London
JOBS = 2 JOBS = 2
ARGS = --rm=false --no-cache=false
include $(wildcard $(DOCKER_HOME)/build/make/*.mk) include $(wildcard $(DOCKER_HOME)/build/make/*.mk)
define add define add
@@ -32,18 +33,17 @@ define script
@python3 $(DOCKER_HOME)/build/parts.py $(1) $(FILE) $(TMP) @python3 $(DOCKER_HOME)/build/parts.py $(1) $(FILE) $(TMP)
endef endef
define arg
@echo 'ARG $(1)' >> ${FILE}
@$(eval ARGS += --build-arg $(1)="$(2)")
endef
all: build bin service clean all: build bin service clean
build: prepare base build: prepare base
$(call script,cleanup) $(call script,cleanup)
@echo 'RUN chmod +x -R /opt/init.d' >> ${FILE} @echo 'RUN chmod +x -R /opt/init.d' >> ${FILE}
@echo 'CMD ["/opt/init"]' >> ${FILE} @echo 'CMD ["/opt/init"]' >> ${FILE}
ifneq ($(PROXY),)
@$(eval ARGS += --build-arg HTTP_PROXY=http://$(PROXY):3142)
endif
ifneq ($(JOBS),)
@$(eval ARGS += --build-arg JOBS="-j $(JOBS)")
endif
docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(DOCKER_HOME)/build
@rm ${FILE} @rm ${FILE}
@@ -51,7 +51,15 @@ prepare:
@$(eval FILE = $(shell mktemp -p $(DOCKER_HOME)/build)) @$(eval FILE = $(shell mktemp -p $(DOCKER_HOME)/build))
@rm $(DOCKER_HOME)/build/tmp.* @rm $(DOCKER_HOME)/build/tmp.*
@echo FROM $(FROM) > ${FILE} @echo FROM $(FROM) > ${FILE}
@echo 'ARG JOBS="-j $(JOBS)"' >> ${FILE} ifneq ($(PROXY),)
$(call arg,PROXY,http://$(PROXY):3142)
endif
ifneq ($(TIMEZONE),)
$(call arg,TIMEZONE,$(TIMEZONE))
endif
ifneq ($(JOBS),)
$(call arg,JOBS,-j $(JOBS))
endif
@echo ENV MODE $(MODE) >> ${FILE} @echo ENV MODE $(MODE) >> ${FILE}
$(call add,config,/build/config) $(call add,config,/build/config)
$(call add,init,/opt/init) $(call add,init,/opt/init)

4
build/scripts/prepare.sh
View File

@@ -46,3 +46,7 @@ apt_install_permanent apt-transport-https
## Upgrade all packages ## Upgrade all packages
apt dist-upgrade -y --no-install-recommends apt dist-upgrade -y --no-install-recommends
## Set timezone
echo $TIMEZONE > /etc/timezone
dpkg-reconfigure -f noninteractive tzdata