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

various fixes

Browse Source
This commit is contained in:
Rik Veenboer
2016-05-14 20:26:55 +01:00
parent f12b0e82af
commit 6a9cd89ced
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/Makefile
View File

@@ -1,4 +1,3 @@
TMP = /build/tmp
FROM = debian:jessie FROM = debian:jessie
MODE = minimal MODE = minimal
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)
@@ -11,6 +10,10 @@ define add
@echo 'ADD $(1) $(2)' >> ${FILE} @echo 'ADD $(1) $(2)' >> ${FILE}
endef endef
define file
$(call add,files/$(1),/$(1))
endef
define execute define execute
$(call add,$(1),$(2)) $(call add,$(1),$(2))
@echo 'RUN $(2)' >> ${FILE} @echo 'RUN $(2)' >> ${FILE}
@@ -30,7 +33,7 @@ define runit
endef endef
define script define script
@python3 $(DOCKER_HOME)/build/parts.py $(1) $(FILE) $(TMP) @python3 $(DOCKER_HOME)/build/parts.py $(1) $(FILE)
endef endef
define arg define arg
@@ -38,18 +41,15 @@ define arg
@$(eval ARGS += --build-arg $(1)="$(2)") @$(eval ARGS += --build-arg $(1)="$(2)")
endef endef
all: build bin service clean build:
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}
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 -f ${FILE}
prepare: prepare:
@$(eval FILE = $(shell mktemp -p $(DOCKER_HOME)/build)) @$(eval FILE = $(shell mktemp -p $(DOCKER_HOME)/build))
@rm $(DOCKER_HOME)/build/tmp.* @rm -f $(DOCKER_HOME)/build/tmp.*
@echo FROM $(FROM) > ${FILE} @echo FROM $(FROM) > ${FILE}
ifneq ($(PROXY),) ifneq ($(PROXY),)
$(call arg,PROXY,http://$(PROXY):3142) $(call arg,PROXY,http://$(PROXY):3142)
@@ -62,13 +62,11 @@ ifneq ($(JOBS),)
endif 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)
@echo 'RUN chmod +x /opt/init' >> ${FILE}
@mkdir -p $(DOCKER_HOME)/build/parts @mkdir -p $(DOCKER_HOME)/build/parts
$(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