X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a3a19bfc20889601b07156a5aa80fd5c6defba4b..4a9470693a06f88c21e89bd2bc0242f741c0e58d:/docker/Makefile

diff --git a/docker/Makefile b/docker/Makefile
index c8b69af303..ac1285b19b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,59 +1,26 @@
-all: api docserver workbench warehouse
+all: api-image doc-image workbench-image warehouse-image sso-image
 
-# ============================================================
-# The main Arvados servers: api, docserver, workbench, warehouse
-
-api: .built-api
-
-.built-api: base $(API_DEPS)
-	docker build -t arvados/api api && touch .built-api
-
-docserver: .built-docserver
-
-.built-docserver: base $(DOCSERVER_DEPS) 
-	docker build -t arvados/docserver docserver && touch .built-docserver
-
-workbench: .built-workbench
-
-.built-workbench: base $(WORKBENCH_DEPS)
-	docker build -t arvados/workbench workbench && touch .built-workbench
-
-warehouse: .built-warehouse
-
-.built-warehouse: base $(WAREHOUSE_DEPS)
-	docker build -t arvados/warehouse warehouse && touch .built-warehouse
-
-# ============================================================
-# The arvados/base image is the base Debian image plus packages
-# that are dependencies for every Arvados service.
-
-base:	.built-base
-
-.built-base:	debian
-	docker build -t arvados/base base && touch .built-base
-
-debian:		.built-debian
-
-.built-debian:
-	./mkimage-debootstrap.sh arvados/debian wheezy http://debian.lcs.mit.edu/debian/ \
-	&& touch .built-debian
+clean:
+	-rm *-image */generated/*
 
 # ============================================================
 # Dependencies for */generated files which are prerequisites
 # for building docker images.
 
-API_DEPS = api/generated/api.tar.gz $(API_GENERATED)
+API_DEPS = api/Dockerfile $(API_GENERATED)
 
-DOCSERVER_DEPS = docserver/generated/doc.tar.gz docserver/apache2_vhost
+DOC_DEPS = doc/Dockerfile doc/apache2_vhost
 
-WORKBENCH_DEPS = workbench/generated/workbench.tar.gz \
+WORKBENCH_DEPS = workbench/Dockerfile \
                  workbench/passenger.conf \
                  $(WORKBENCH_GENERATED)
 
-WAREHOUSE_DEPS = warehouse/generated/warehouse.tar.gz \
+WAREHOUSE_DEPS = warehouse/Dockerfile \
                  warehouse/supervisor.conf \
                  $(WAREHOUSE_GENERATED)
 
+SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
+
 API_GENERATED = \
         api/generated/apache2_vhost \
         api/generated/config_databases.sh \
@@ -71,12 +38,12 @@ API_GENERATED_IN = \
         api/secret_token.rb.in
 
 WORKBENCH_GENERATED = \
-        workbench/generated/apache_vhost \
+        workbench/generated/apache2_vhost \
         workbench/generated/production.rb \
         workbench/generated/secret_token.rb
 
 WORKBENCH_GENERATED_IN = \
-        workbench/apache_vhost.in \
+        workbench/apache2_vhost.in \
         workbench/production.rb.in \
         workbench/secret_token.rb.in
 
@@ -84,22 +51,70 @@ WAREHOUSE_GENERATED = warehouse/generated/warehouse.conf
 
 WAREHOUSE_GENERATED_IN = warehouse/warehouse.conf.in
 
-api/generated/api.tar.gz:
-	tar -c -z -f api/generated/api.tar.gz -C ../services api
+SSO_GENERATED = \
+        sso/generated/apache2_vhost \
+        sso/generated/seeds.rb \
+        sso/generated/secret_token.rb
 
-docserver/generated/doc.tar.gz:
-	tar -c -z -f docserver/generated/doc.tar.gz -C .. doc
+SSO_GENERATED_IN = \
+        sso/apache2_vhost.in \
+        sso/seeds.rb.in \
+        sso/secret_token.rb.in
 
-workbench/generated/workbench.tar.gz:
-	tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
+$(API_GENERATED): config.yml $(API_GENERATED_IN)
+	./config.rb
 
-warehouse/generated/warehouse.tar.gz:
-	tar -c -z -f warehouse/generated/warehouse.tar.gz -C ../.. warehouse-apps
-$(API_GENERATED): $(API_GENERATED_IN)
+$(WORKBENCH_GENERATED): config.yml $(WORKBENCH_GENERATED_IN)
 	./config.rb
 
-$(WORKBENCH_GENERATED): $(WORKBENCH_GENERATED_IN)
+$(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN)
 	./config.rb
 
-$(WAREHOUSE_GENERATED): $(WAREHOUSE_GENERATED_IN)
+$(SSO_GENERATED): config.yml $(SSO_GENERATED_IN)
 	./config.rb
+
+# ============================================================
+# 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
+	echo -n "Built at $(date)" > api-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
+	echo -n "Built at $(date)" > workbench-image
+
+warehouse-image: base-image $(WAREHOUSE_DEPS)
+	./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
+	echo -n "Built at $(date)" > sso-image
+
+# ============================================================
+# The arvados/base image is the base Debian image plus packages
+# that are dependencies for every Arvados service.
+
+passenger-image: base-image
+	./docker_build -t arvados/passenger passenger
+	echo -n "Built at $(date)" > passenger-image
+
+base-image: debian-image
+	./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/
+	echo -n "Built at $(date)" > debian-image
+