3761: log errors in RunPullWorker instead of Pull method.

[arvados.git] / docker / build_tools / Makefile

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index f3dd90c6c741db3a1a3dd0ec0e98bfbce0323283..9d93d2bdef7099413e3ca32a34b70ee2e0141163 100644 (file)
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -60,6 +60,8 @@ SLURM_DEPS = slurm/Dockerfile config.yml $(SLURM_GENERATED)
 
 JOBS_DEPS = jobs/Dockerfile
 
+ARV_WEB_DEPS = arv-web/Dockerfile arv-web/apache2_foreground.sh arv-web/apache2_vhost
+
 JAVA_BWA_SAMTOOLS_DEPS = java-bwa-samtools/Dockerfile
 
 API_DEPS = api/* config.yml $(API_GENERATED)
@@ -148,10 +150,7 @@ $(SSO_GENERATED): $(SSO_GENERATED_IN)
 $(KEEP_GENERATED): $(KEEP_GENERATED_IN)
        $(CONFIG_RB) keep
 
-# 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 --rm=true
+DOCKER_BUILD = $(DOCKER) build --rm=true
 
 # ============================================================
 # The main Arvados servers: api, doc, workbench, compute
@@ -212,6 +211,10 @@ sso-image: passenger-image $(SSO_DEPS)
        $(DOCKER_BUILD) -t arvados/sso sso
        date >sso-image
 
+arv-web-image: passenger-image $(ARV_WEB_DEPS)
+       $(DOCKER_BUILD) -t arvados/arv-web arv-web
+       date >arv-web-image
+
 # ============================================================
 # The arvados/base image is the base Debian image plus packages
 # that are dependencies for every Arvados service.