X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e32b7e889cddcf122ca1face24076450049652cc..0b3ae1c64548f41c3930ac76d90466c2ce6cc639:/docker/Makefile

diff --git a/docker/Makefile b/docker/Makefile
index b80261c6c4..b365b70add 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,4 +1,4 @@
-all: api-image docserver-image workbench-image warehouse-image sso-image
+all: api-image doc-image workbench-image warehouse-image sso-image
 
 clean:
 	-rm *-image */generated/*
@@ -7,9 +7,11 @@ clean:
 # 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 +23,16 @@ WAREHOUSE_DEPS = warehouse/Dockerfile \
 
 SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
 
+BASE_GENERATED = base/generated
+
 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 +40,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,6 +67,9 @@ SSO_GENERATED_IN = \
         sso/seeds.rb.in \
         sso/secret_token.rb.in
 
+$(BASE_GENERATED): config.yml
+	./config.rb
+
 $(API_GENERATED): config.yml $(API_GENERATED_IN)
 	./config.rb
 
@@ -74,7 +83,7 @@ $(SSO_GENERATED): config.yml $(SSO_GENERATED_IN)
 	./config.rb
 
 # ============================================================
-# 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
@@ -82,11 +91,11 @@ api-image: passenger-image $(API_DEPS)
 	./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
@@ -110,7 +119,7 @@ passenger-image: base-image
 	./docker_build -t arvados/passenger passenger
 	echo -n "Built at $(date)" > passenger-image
 
-base-image: debian-image
+base-image: debian-image $(BASE_DEPS)
 	./docker_build -t arvados/base base
 	echo -n "Built at $(date)" > base-image