projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 7f3ad6913908f088b4eee289c9e6e6292de25667..9d93d2bdef7099413e3ca32a34b70ee2e0141163 100644
(file)
--- a/
docker/build_tools/Makefile
+++ b/
docker/build_tools/Makefile
@@
-7,7
+7,6
@@
endif
all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image sso-image shell-image
IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v -E 'debian-arvados-image|skydns-image|skydock-image')
all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image sso-image shell-image
IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v -E 'debian-arvados-image|skydns-image|skydock-image')
-GENERATED_FILES := $(shell ls */generated/* 2>/dev/null)
GENERATED_DIRS := $(shell ls */generated 2>/dev/null)
# `make clean' removes the files generated in the build directory
GENERATED_DIRS := $(shell ls */generated 2>/dev/null)
# `make clean' removes the files generated in the build directory
@@
-15,8
+14,8
@@
GENERATED_DIRS := $(shell ls */generated 2>/dev/null)
clean:
@echo "make clean"
-@rm -rf build
clean:
@echo "make clean"
-@rm -rf build
- +@[ "$(IMAGE_FILES)
$(GENERATED_FILES)" = "" ] || rm $(IMAGE_FILES) $(GENERATED
_FILES) 2>/dev/null
- +@[ "$(GENERATED_DIRS)" = "" ] || rm
dir
*/generated 2>/dev/null
+ +@[ "$(IMAGE_FILES)
" = "" ] || rm -f $(IMAGE
_FILES) 2>/dev/null
+ +@[ "$(GENERATED_DIRS)" = "" ] || rm
-rf
*/generated 2>/dev/null
DEBIAN_IMAGE := $(shell $(DOCKER) images -q arvados/debian |head -n1)
DEBIAN_IMAGE := $(shell $(DOCKER) images -q arvados/debian |head -n1)
@@
-61,6
+60,8
@@
SLURM_DEPS = slurm/Dockerfile config.yml $(SLURM_GENERATED)
JOBS_DEPS = jobs/Dockerfile
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)
JAVA_BWA_SAMTOOLS_DEPS = java-bwa-samtools/Dockerfile
API_DEPS = api/* config.yml $(API_GENERATED)
@@
-149,10
+150,7
@@
$(SSO_GENERATED): $(SSO_GENERATED_IN)
$(KEEP_GENERATED): $(KEEP_GENERATED_IN)
$(CONFIG_RB) keep
$(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
# ============================================================
# The main Arvados servers: api, doc, workbench, compute
@@
-213,6
+211,10
@@
sso-image: passenger-image $(SSO_DEPS)
$(DOCKER_BUILD) -t arvados/sso sso
date >sso-image
$(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.
# ============================================================
# The arvados/base image is the base Debian image plus packages
# that are dependencies for every Arvados service.