X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/97f3ab858482c9d68972fa0fe3cb887d7968fcc7..74d53a1ab38162c4c0977f12568617f7beb57c45:/docker/build_tools/Makefile?ds=inline

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 346b5c5182..994749bc0a 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -1,29 +1,50 @@
-all: api-image compute-image doc-image workbench-image keep-image sso-image shell-image
+# This is the 'shell hack'. Call make with DUMP=1 to see the effect.
+ifdef DUMP
+OLD_SHELL := $(SHELL)
+SHELL = $(warning [$@])$(OLD_SHELL) -x
+endif
+
+all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image sso-image shell-image
+
+IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v debian-arvados-image)
+GENERATED_FILES := $(shell ls */generated/* 2>/dev/null)
+GENERATED_DIRS := $(shell ls */generated 2>/dev/null)
 
 # `make clean' removes the files generated in the build directory
 # but does not remove any docker images generated in previous builds
 clean:
-	-rm -rf build
-	-rm `ls *-image |grep -v debian-arvados-image` */generated/*
-	-@rmdir */generated
+	@echo "make clean"
+	-@rm -rf build
+	+@[ "$(IMAGE_FILES)$(GENERATED_FILES)" = "" ] || rm $(IMAGE_FILES) $(GENERATED_FILES) 2>/dev/null
+	+@[ "$(GENERATED_DIRS)" = "" ] || rmdir */generated 2>/dev/null
 
 DEBIAN_IMAGE := $(shell $(DOCKER) images -q arvados/debian |head -n1)
 
+REALCLEAN_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' ')
+REALCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE) 2>/dev/null)
+DEEPCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/*)
+SKYDNS_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e crosbymichael/skydns -e crosbymichael/skydock |cut -f 1 -d' ')
+SKYDNS_IMAGES := $(shell $(DOCKER) images -q crosbymichael/skyd*)
+
 # `make realclean' will also remove the Arvados docker images (but not the
 # arvados/debian image) and force subsequent makes to build the entire chain
 # from the ground up
 realclean: clean
-	-[ -n "`$(DOCKER) ps -q`" ] && $(DOCKER) stop `$(DOCKER) ps -q`
-	-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
-	-$(DOCKER) rmi `$(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE)`
+	@echo "make realclean"
+	+@[ "`$(DOCKER) ps -q`" = '' ] || $(DOCKER) stop `$(DOCKER) ps -q`
+	+@[ "$(REALCLEAN_CONTAINERS)" = '' ] || $(DOCKER) rm $(REALCLEAN_CONTAINERS)
+	+@[ "$(REALCLEAN_IMAGES)" = '' ] || $(DOCKER) rmi $(REALCLEAN_IMAGES)
 
-# `make deepclean' will remove all Arvados docker images and force
-# subsequent makes to build the entire chain from the ground up
+# `make deepclean' will remove all Arvados docker images and the skydns/skydock
+# images and force subsequent makes to build the entire chain from the ground up
 deepclean: clean
-	-rm debian-arvados-image
-	-[ -n "`$(DOCKER) ps -q`" ] && $(DOCKER) stop `$(DOCKER) ps -q`
-	-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
-	-$(DOCKER) rmi `$(DOCKER) images -q arvados/*`
+	@echo "make deepclean"
+	-@rm -f debian-arvados-image 2>/dev/null
+	+@[ "`$(DOCKER) ps -q`" = '' ] || $(DOCKER) stop `$(DOCKER) ps -q`
+	+@[ "$(REALCLEAN_CONTAINERS)" = '' ] || $(DOCKER) rm $(REALCLEAN_CONTAINERS)
+	+@[ "$(DEEPCLEAN_IMAGES)" = '' ] || $(DOCKER) rmi $(DEEPCLEAN_IMAGES)
+	+@[ "$(SKYDNS_CONTAINERS)" = '' ] || $(DOCKER) rm $(SKYDNS_CONTAINERS)
+	+@[ "$(SKYDNS_IMAGES)" = '' ] || $(DOCKER) rmi $(SKYDNS_IMAGES)
 
 # ============================================================
 # Dependencies for */generated files which are prerequisites
@@ -52,7 +73,7 @@ DOC_DEPS = doc/Dockerfile doc/apache2_vhost
 WORKBENCH_DEPS = workbench/Dockerfile \
                  $(WORKBENCH_GENERATED)
 
-KEEP_DEPS = keep/Dockerfile
+KEEP_DEPS = keep/Dockerfile $(KEEP_GENERATED)
 
 SSO_DEPS = $(SSO_GENERATED)
 
@@ -66,6 +87,10 @@ COMPUTE_GENERATED = compute/generated/setup.sh
 
 COMPUTE_GENERATED_IN = compute/setup.sh.in
 
+KEEP_GENERATED_IN := $(shell ls keep/*.in)
+
+KEEP_GENERATED := $(shell ls -1 $(KEEP_GENERATED_IN) | perl -pe 's:^keep:keep/generated:; s:\.in$::')
+
 API_GENERATED = \
         api/generated/arvados-clients.yml \
         api/generated/apache2_vhost \
@@ -105,10 +130,12 @@ SLURM_GENERATED_IN = \
         slurm/slurm.conf.in
 
 WORKBENCH_GENERATED = \
+        workbench/generated/workbench_rails_env \
         workbench/generated/apache2_vhost \
         workbench/generated/application.yml
 
 WORKBENCH_GENERATED_IN = \
+        workbench/workbench_rails_env.in \
         workbench/apache2_vhost.in \
         workbench/application.yml.in
 
@@ -152,6 +179,7 @@ $(WORKBENCH_GENERATED): config.yml $(WORKBENCH_GENERATED_IN)
 	$(CONFIG_RB)
 
 $(COMPUTE_GENERATED): config.yml $(COMPUTE_GENERATED_IN)
+	$(CONFIG_RB)
 
 $(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN)
 	$(CONFIG_RB)
@@ -159,6 +187,9 @@ $(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN)
 $(SSO_GENERATED): config.yml $(SSO_GENERATED_IN)
 	$(CONFIG_RB)
 
+$(KEEP_GENERATED): config.yml $(KEEP_GENERATED_IN)
+	$(CONFIG_RB)
+
 # The docker build -q option suppresses verbose build output.
 # Necessary to prevent failure on building warehouse; see
 # https://github.com/dotcloud/docker/issues/3172
@@ -177,23 +208,27 @@ api-image: passenger-image $(BUILD) $(API_DEPS)
 	date >api-image
 
 shell-image: base-image $(BUILD) $(SHELL_DEPS)
+	@echo "Building shell-image"
 	mkdir -p shell/generated
 	chmod 755 shell/generated/setup.sh
 	$(DOCKER_BUILD) -t arvados/shell shell
 	date >shell-image
 
 compute-image: slurm-image $(BUILD) $(COMPUTE_DEPS)
+	@echo "Building compute-image"
 	chmod 755 compute/generated/setup.sh
 	$(DOCKER_BUILD) -t arvados/compute compute
 	date >compute-image
 
 doc-image: base-image $(BUILD) $(DOC_DEPS)
+	@echo "Building doc-image"
 	mkdir -p doc/generated
 	tar -czf doc/generated/doc.tar.gz -C build doc
 	$(DOCKER_BUILD) -t arvados/doc doc
 	date >doc-image
 
 keep-image: debian-arvados-image $(BUILD) $(KEEP_DEPS)
+	@echo "Building keep-image"
 	$(DOCKER_BUILD) -t arvados/keep keep
 	date >keep-image
 
@@ -212,6 +247,7 @@ bcbio-nextgen-image: $(BUILD) $(BASE_GENERATED) $(BCBIO_NEXTGEN_DEPS)
 	date >bcbio-nextgen-image
 
 workbench-image: passenger-image $(BUILD) $(WORKBENCH_DEPS)
+	@echo "Building workbench-image"
 	mkdir -p workbench/generated
 	tar -czf workbench/generated/workbench.tar.gz -C build/apps workbench
 	$(DOCKER_BUILD) -t arvados/workbench workbench
@@ -222,6 +258,7 @@ warehouse-image: base-image $(WAREHOUSE_DEPS)
 	date >warehouse-image
 
 sso-image: passenger-image $(SSO_DEPS)
+	@echo "Building sso-image"
 	$(DOCKER_BUILD) -t arvados/sso sso
 	date >sso-image
 
@@ -230,10 +267,12 @@ sso-image: passenger-image $(SSO_DEPS)
 # that are dependencies for every Arvados service.
 
 passenger-image: base-image
+	@echo "Building passenger-image"
 	$(DOCKER_BUILD) -t arvados/passenger passenger
 	date >passenger-image
 
 slurm-image: base-image $(SLURM_DEPS)
+	@echo "Building slurm-image"
 	$(DOCKER_BUILD) -t arvados/slurm slurm
 	date >slurm-image
 
@@ -243,5 +282,16 @@ base-image: debian-arvados-image $(BASE_DEPS)
 	date >base-image
 
 debian-arvados-image:
+	@echo "Building debian-arvados-image"
 	./mkimage-debootstrap.sh arvados/debian wheezy ftp://ftp.us.debian.org/debian/
 	date >debian-arvados-image
+
+skydns-image:
+	@echo "Downloading skydns-image"
+	$(DOCKER) pull crosbymichael/skydns
+	date >skydns-image
+
+skydock-image:
+	@echo "Downloading skydock-image"
+	$(DOCKER) pull crosbymichael/skydock
+	date >skydock-image