Merge branch 'master' into 2221-complete-docker

[arvados.git] / docker / Makefile

diff --git a/docker/Makefile b/docker/Makefile
index 3b21b43c65095dd36fac54c98db18ba27f110852..d949db059e45294a3f4c7f318cff1169dc23d0ac 100644 (file)
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,7 +1,17 @@
 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
@@ -23,7 +33,7 @@ WAREHOUSE_DEPS = warehouse/Dockerfile \
 
 SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
 
-BASE_GENERATED = base/generated
+BASE_GENERATED = base/generated/arvados.tar.gz
 
 API_GENERATED = \
         api/generated/apache2_vhost \
@@ -69,6 +79,10 @@ SSO_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/*
+
 
 $(API_GENERATED): config.yml $(API_GENERATED_IN)
        ./config.rb
@@ -82,33 +96,38 @@ $(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN)
 $(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, 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
 
 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
+       $(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
 
 # ============================================================
@@ -116,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 $(BASE_DEPS)
-       docker build -t arvados/base base
+       $(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