X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9a34798694440329fde1980e4ca55f2768e68228..428359fce0a1b8f9b922236cb55937ec6339a275:/docker/Makefile

diff --git a/docker/Makefile b/docker/Makefile
index fa05068c50..d949db059e 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,15 +1,27 @@
-all: api-image docserver-image workbench-image warehouse-image sso-image
+all: api-image doc-image workbench-image warehouse-image sso-image
 
+# `make clean' removes the files generated in the build directory
+# but does not remove any docker images generated in previous builds
 clean:
 	-rm *-image */generated/*
+	-@rmdir */generated
+
+# `make realclean' will also remove the docker images 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 -q`
+	-docker rmi `docker images -q`
 
 # ============================================================
 # Dependencies for */generated files which are prerequisites
 # for building docker images.
 
+BASE_DEPS = base/Dockerfile $(BASE_GENERATED)
+
 API_DEPS = api/Dockerfile $(API_GENERATED)
 
-DOCSERVER_DEPS = docserver/Dockerfile docserver/apache2_vhost
+DOC_DEPS = doc/Dockerfile doc/apache2_vhost
 
 WORKBENCH_DEPS = workbench/Dockerfile \
                  workbench/passenger.conf \
@@ -21,13 +33,16 @@ WAREHOUSE_DEPS = warehouse/Dockerfile \
 
 SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
 
+BASE_GENERATED = base/generated/arvados.tar.gz
+
 API_GENERATED = \
         api/generated/apache2_vhost \
         api/generated/config_databases.sh \
         api/generated/database.yml \
         api/generated/omniauth.rb \
         api/generated/production.rb \
-        api/generated/secret_token.rb
+        api/generated/secret_token.rb \
+        api/generated/superuser_token
 
 API_GENERATED_IN = \
         api/apache2_vhost.in \
@@ -35,7 +50,8 @@ API_GENERATED_IN = \
         api/database.yml.in \
         api/omniauth.rb.in \
         api/production.rb.in \
-        api/secret_token.rb.in
+        api/secret_token.rb.in \
+        api/superuser_token.in
 
 WORKBENCH_GENERATED = \
         workbench/generated/apache2_vhost \
@@ -61,45 +77,57 @@ SSO_GENERATED_IN = \
         sso/seeds.rb.in \
         sso/secret_token.rb.in
 
-$(API_GENERATED): $(API_GENERATED_IN)
+$(BASE_GENERATED): config.yml
 	./config.rb
+	mkdir -p base/generated
+	tar -c -z -f base/generated/arvados.tar.gz -C .. . \
+	  --exclude=services/api/log/* --exclude=docker/*
+
 
-$(WORKBENCH_GENERATED): $(WORKBENCH_GENERATED_IN)
+$(API_GENERATED): config.yml $(API_GENERATED_IN)
 	./config.rb
 
-$(WAREHOUSE_GENERATED): $(WAREHOUSE_GENERATED_IN)
+$(WORKBENCH_GENERATED): config.yml $(WORKBENCH_GENERATED_IN)
 	./config.rb
 
-$(SSO_GENERATED): $(SSO_GENERATED_IN)
+$(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN)
 	./config.rb
 
+$(SSO_GENERATED): config.yml $(SSO_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
+DOCKER_BUILD = docker build -q
+
 # ============================================================
-# The main Arvados servers: api, docserver, workbench, warehouse
+# The main Arvados servers: api, doc, workbench, warehouse
 
 api-image: passenger-image $(API_DEPS)
 	mkdir -p api/generated
-	tar -c -z -f api/generated/api.tar.gz -C ../services api
-	./docker_build -t arvados/api api
+	tar -c -z -f api/generated/api.tar.gz -C ../services api --exclude=api/log/*
+	$(DOCKER_BUILD) -t arvados/api api
 	echo -n "Built at $(date)" > api-image
 
-docserver-image: base-image $(DOCSERVER_DEPS)
-	mkdir -p docserver/generated
-	tar -c -z -f docserver/generated/doc.tar.gz -C .. doc
-	./docker_build -t arvados/docserver docserver
-	echo -n "Built at $(date)" > docserver-image
+doc-image: base-image $(DOC_DEPS)
+	mkdir -p doc/generated
+	tar -c -z -f doc/generated/doc.tar.gz -C .. doc
+	$(DOCKER_BUILD) -t arvados/doc doc
+	echo -n "Built at $(date)" > doc-image
 
 workbench-image: passenger-image $(WORKBENCH_DEPS)
 	mkdir -p workbench/generated
 	tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
-	./docker_build -t arvados/workbench workbench
+	$(DOCKER_BUILD) -t arvados/workbench workbench
 	echo -n "Built at $(date)" > workbench-image
 
 warehouse-image: base-image $(WAREHOUSE_DEPS)
-	./docker_build -t arvados/warehouse warehouse
+	$(DOCKER_BUILD) -t arvados/warehouse warehouse
 	echo -n "Built at $(date)" > warehouse-image
 
 sso-image: passenger-image $(SSO_DEPS)
-	./docker_build -t arvados/sso sso
+	$(DOCKER_BUILD) -t arvados/sso sso
 	echo -n "Built at $(date)" > sso-image
 
 # ============================================================
@@ -107,14 +135,14 @@ sso-image: passenger-image $(SSO_DEPS)
 # that are dependencies for every Arvados service.
 
 passenger-image: base-image
-	./docker_build -t arvados/passenger passenger
+	$(DOCKER_BUILD) -t arvados/passenger passenger
 	echo -n "Built at $(date)" > passenger-image
 
-base-image: debian-image
-	./docker_build -t arvados/base base
+base-image: debian-image $(BASE_DEPS)
+	$(DOCKER_BUILD) -t arvados/base base
 	echo -n "Built at $(date)" > base-image
 
 debian-image:
-	./mkimage-debootstrap.sh arvados/debian wheezy http://debian.lcs.mit.edu/debian/
+	./mkimage-debootstrap.sh arvados/debian wheezy ftp://ftp.us.debian.org/debian/
 	echo -n "Built at $(date)" > debian-image