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

Add option to serve http via proxy to use apt-cacher (on host)

Browse Source
This commit is contained in:
Rik Veenboer
2016-04-09 16:25:34 +01:00
parent afa82ec039
commit cdc5c7c426
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
build/Makefile
View File

@@ -1,7 +1,8 @@
TMP = /build/tmp TMP = /build/tmp
FROM = debian:jessie FROM = debian:jessie
MODE = normal MODE = minimal
ARGS = --rm=false --no-cache=false ARGS = --rm=false --no-cache=false
PROXY = $(shell ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | cut -d' ' -f1)
include $(wildcard $(DOCKER_HOME)/build/make/*.mk) include $(wildcard $(DOCKER_HOME)/build/make/*.mk)
define add define add
@@ -36,6 +37,9 @@ 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
@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}
@@ -44,9 +48,10 @@ prepare:
@echo FROM $(FROM) > ${FILE} @echo FROM $(FROM) > ${FILE}
@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)
@echo 'RUN chmod +x /opt/init' >> ${FILE} @echo 'RUN chmod +x /opt/init' >> ${FILE}
$(call script,prepare) $(call script,prepare)
clean: clean:
@rm -f ${FILE} @rm -f ${FILE}
@rm -rf build @rm -rf build
@@ -54,10 +59,10 @@ clean:
ssh: ssh:
@ID=$$(docker ps | grep "$(NAME):$(VERSION)" | awk '{ print $$1 }') && \ @ID=$$(docker ps | grep "$(NAME):$(VERSION)" | awk '{ print $$1 }') && \
if test "$$ID" = ""; then echo "Container is not running."; exit 1; fi && \ if test "$$ID" = ""; then echo "Container is not running."; exit 1; fi && \
if ! test -s id_rsa; then \ if ! test -s id_rsa; then \
docker cp $$ID:/opt/id_rsa . ;\ docker cp $$ID:/opt/id_rsa . ;\
fi && \ fi && \
IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $$ID) && \ IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $$ID) && \
echo "SSHing into $$IP" && \ echo "SSHing into $$IP" && \
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$$IP ${CMD} ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa root@$$IP ${CMD}