Modify setup for more flexible building process

build/Makefile

@@ -1,14 +1,54 @@
-include $(wildcard /opt/docker/build/make/*.mk)
+HOME = $(DOCKER_HOME)
-BASE = /opt/docker/build
+BASE = $(HOME)/build
+DIR = $(HOME)/images/$(NAME)
+FILE = $(DIR)/Dockerfile
+FROM = ubuntu:trusty
+PORT = 8001
+MODE = minimal
+ARGS = --no-cache
+
+include $(wildcard $(HOME)/build/make/*.mk)
+
+define download
+	@echo 'RUN wget -q $(1) $$HOST_ADDR:$$HOST_PORT/$(2) $(3)' >> ${FILE}
+endef
+
+define execute
+	$(call download,-O -,$(1),| bash)
+endef
+
+define script
+	$(call execute,scripts/$(1).sh)
+endef
+
+define boot
+	$(call download,-O /opt/init.d/$(1)_$(2),boot/$(2).sh)
+endef
+
+define runit
+	@echo 'RUN mkdir -p /etc/service/$(1)' >> ${FILE}
+	$(call download,-O /etc/service/$(1)/run,runit/$(1))
+endef
 
 all: build bin service clean
 
-build:
+build: prepare
-	cp $(BASE)/Dockerfile .
+	$(call script,cleanup)
-	docker build -t $(NAME):$(VERSION) --rm .
+	@echo 'CMD ["/opt/init"]' >> ${FILE}
+	@$(shell cd ${BASE} && python -m SimpleHTTPServer $(PORT) > /dev/null &)
+	@docker build -t $(NAME):$(VERSION) --rm=true $(ARGS) ${DIR}
+	@kill -9 $(lsof -i tcp:8001 -t)
 
-directory:
+prepare:
-	@mkdir -p build/boot build/runit build/scripts
+	@echo FROM $(FROM) > ${FILE}
+	@echo ENV MODE $(MODE) >> ${FILE}
+	@$(eval HOST_ADDR := $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{print $$1}'))
+	@echo ENV HOST_ADDR $(HOST_ADDR) >> ${FILE}
+	@echo ENV HOST_PORT $(PORT) >> ${FILE}
+	@echo 'RUN apt-get install -y wget' >> ${FILE}
+	$(call download,-P /build,config,)
+	$(call download,-P /build,init)
+	$(call script,prepare)
 
 service:
 	@if test "${DEPENDS}" != ""; then \
@@ -23,6 +63,7 @@ service:
 	@mv init.conf /etc/init/docker-$(NAME).conf
 
 bin:
+	@rm -r bin
 	@mkdir -p bin
 	@ln -sf $(BASE)/bin/run bin
 	@ln -sf $(BASE)/bin/ssh bin
@@ -31,7 +72,7 @@ bin:
 	@sed -i "1iARGS=\"$(SSH)\"" bin/ssh
 
 clean:
-	@rm -f Dockerfile
+	@rm -f ${FILE}
 	@rm -rf build
 	@rm -rf id_rsa
 

build/make/base.mk

@@ -1,10 +1,6 @@
-base: directory cron syslog sshd hosts
+base: cron syslog sshd hosts
-	ln -f $(BASE)/config build
+#	$(call script,boot)
-	ln -f $(BASE)/init build
+#	$(call script,init)
-	ln -f $(BASE)/scripts/*_prepare.sh build/scripts
+#	$(call script,runit)
-	ln -f $(BASE)/scripts/*_boot.sh build/scripts
+#	$(call script,logrotate)
-	ln -f $(BASE)/scripts/*_init.sh build/scripts
+#	$(call script,utilities)
-	ln -f $(BASE)/scripts/*_runit.sh build/scripts
-	ln -f $(BASE)/scripts/*_logrotate.sh build/scripts
-	ln -f $(BASE)/scripts/*_utilities.sh build/scripts
-	ln -f $(BASE)/scripts/*_cleanup.sh build/scripts

build/make/compile.mk

@@ -0,0 +1,2 @@
+compile:
+	ln -f $(BASE)/scripts/*_$@.sh build/scripts

build/make/cron.mk

@@ -1,3 +1,3 @@
 cron:
-	ln -f $(BASE)/scripts/*_$@.sh build/scripts
+	$(call script,$@)
-	ln -f $(BASE)/runit/$@ build/runit
+	$(call runit,$@)

build/make/gmrender.mk

@@ -0,0 +1,3 @@
+gmrender: compile
+	cp $(BASE)/scripts/*_$@.sh build/scripts
+	cp $(BASE)/runit/$@ build/runit

build/make/hosts.mk

@@ -1,3 +1,3 @@
 hosts:
-	ln -f $(BASE)/scripts/*_$@.sh build/scripts
+	$(call script,$@)
-	ln -f $(BASE)/boot/*_$@.sh build/boot
+	$(call boot,01,$@)

build/make/logrotate.mk

@@ -0,0 +1,2 @@
+logrotate:
+	ln -f $(BASE)/scripts/*_$@.sh build/scripts

build/make/minidlna.mk

@@ -0,0 +1,3 @@
+minidlna: compile
+	ln -f $(BASE)/scripts/*_$@.sh build/scripts
+	ln -f $(BASE)/runit/$@ build/runit

build/make/sshd.mk

@@ -1,3 +1,3 @@
 sshd:
-	ln -f $(BASE)/scripts/*_$@.sh build/scripts
+	$(call script,$@)
-	ln -f $(BASE)/runit/$@ build/runit
+	$(call runit,$@)

build/make/syslog.mk

@@ -1,3 +1,3 @@
 syslog:
-	ln -f $(BASE)/scripts/*_$@.sh build/scripts
+	$(call script,$@)
-	ln -f $(BASE)/runit/$@ build/runit
+	$(call runit,$@)

build/make/upnpproxy.mk

@@ -0,0 +1,3 @@
+upnpproxy: compile
+	cp $(BASE)/scripts/*_$@.sh build/scripts
+	cp $(BASE)/runit/$@ build/runit