X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5ce0e0fe745c8d3e0f23629f26eeb8b0d01923db..8cda7f9ce25adeff03b9636f70026f5e9263dbe8:/docker/build_tools/Makefile diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile index 240e820d0c..621aa04797 100644 --- a/docker/build_tools/Makefile +++ b/docker/build_tools/Makefile @@ -4,10 +4,9 @@ OLD_SHELL := $(SHELL) SHELL = $(warning [$@])$(OLD_SHELL) -x endif -all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image sso-image shell-image +all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image keep-proxy-image sso-image shell-image -IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v debian-arvados-image) -GENERATED_FILES := $(shell ls */generated/* 2>/dev/null) +IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v -E 'debian-arvados-image|skydns-image|skydock-image') GENERATED_DIRS := $(shell ls */generated 2>/dev/null) # `make clean' removes the files generated in the build directory @@ -15,12 +14,12 @@ GENERATED_DIRS := $(shell ls */generated 2>/dev/null) clean: @echo "make clean" -@rm -rf build - +@[ "$(IMAGE_FILES)$(GENERATED_FILES)" = "" ] || rm $(IMAGE_FILES) $(GENERATED_FILES) 2>/dev/null - +@[ "$(GENERATED_DIRS)" = "" ] || rmdir */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) -REALCLEAN_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' ') +REALCLEAN_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e keep_proxy_server -e doc_server -e workbench_server |cut -f 1 -d' ') REALCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE) 2>/dev/null) DEEPCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/*) SKYDNS_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e crosbymichael/skydns -e crosbymichael/skydock |cut -f 1 -d' ') @@ -40,6 +39,7 @@ realclean: clean deepclean: clean @echo "make deepclean" -@rm -f debian-arvados-image 2>/dev/null + -@rm -f skydns-image skydock-image 2>/dev/null +@[ "`$(DOCKER) ps -q`" = '' ] || $(DOCKER) stop `$(DOCKER) ps -q` +@[ "$(REALCLEAN_CONTAINERS)" = '' ] || $(DOCKER) rm $(REALCLEAN_CONTAINERS) +@[ "$(DEEPCLEAN_IMAGES)" = '' ] || $(DOCKER) rmi $(DEEPCLEAN_IMAGES) @@ -52,8 +52,6 @@ deepclean: clean CONFIG_RB = build_tools/config.rb -LIST_GENERATED_FILES = build_tools/list_generated_files - BUILD = build/.buildstamp BASE_DEPS = base/Dockerfile config.yml $(BASE_GENERATED) @@ -62,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) @@ -78,32 +78,50 @@ WORKBENCH_DEPS = workbench/Dockerfile \ KEEP_DEPS = keep/Dockerfile config.yml $(KEEP_GENERATED) +KEEP_PROXY_DEPS = keepproxy/Dockerfile config.yml $(KEEP_PROXY_GENERATED) + SSO_DEPS = config.yml $(SSO_GENERATED) BCBIO_NEXTGEN_DEPS = bcbio-nextgen/Dockerfile BASE_GENERATED = base/generated/arvados.tar.gz -COMPUTE_GENERATED_IN = $(shell ls compute/*.in) -COMPUTE_GENERATED = $(shell $(LIST_GENERATED_FILES) $(COMPUTE_GENERATED_IN)) +COMPUTE_GENERATED_IN = compute/*.in +COMPUTE_GENERATED = compute/generated/* + +KEEP_GENERATED_IN = keep/*.in +KEEP_GENERATED = keep/generated/* + +KEEP_PROXY_GENERATED_IN = keepproxy/*.in +KEEP_PROXY_GENERATED = keepproxy/generated/* -KEEP_GENERATED_IN = $(shell ls keep/*.in) -KEEP_GENERATED = $(shell $(LIST_GENERATED_FILES) $(KEEP_GENERATED_IN)) +API_GENERATED_IN = api/*.in +API_GENERATED = api/generated/* -API_GENERATED_IN = $(shell ls api/*.in) -API_GENERATED = $(shell $(LIST_GENERATED_FILES) $(API_GENERATED_IN)) +SHELL_GENERATED_IN = shell/*.in +SHELL_GENERATED = shell/generated/* -SHELL_GENERATED_IN = $(shell ls shell/*.in) -SHELL_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SHELL_GENERATED_IN)) +SLURM_GENERATED_IN = slurm/*.in +SLURM_GENERATED = slurm/generated/* -SLURM_GENERATED_IN = $(shell ls slurm/*.in) -SLURM_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SLURM_GENERATED_IN)) +WORKBENCH_GENERATED_IN = workbench/*.in +WORKBENCH_GENERATED = workbench/generated/* -WORKBENCH_GENERATED_IN = $(shell ls workbench/*.in) -WORKBENCH_GENERATED = $(shell $(LIST_GENERATED_FILES) $(WORKBENCH_GENERATED_IN)) +SSO_GENERATED_IN = sso/*.in +SSO_GENERATED = sso/generated/* -SSO_GENERATED_IN = $(shell ls sso/*.in) -SSO_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SSO_GENERATED_IN)) +KEEP_DEPS += keep/generated/bin/keepproxy +KEEP_DEPS += keep/generated/bin/keepstore +keep/generated/bin/%: $(wildcard build/services/%/*.go) + mkdir -p keep/generated/src/git.curoverse.com + ln -sfn ../../../../.. keep/generated/src/git.curoverse.com/arvados.git + GOPATH=$(shell pwd)/keep/generated go get $(@:keep/generated/bin/%=git.curoverse.com/arvados.git/services/%) + +KEEP_PROXY_DEPS += keepproxy/generated/bin/keepproxy +keepproxy/generated/bin/%: $(wildcard build/services/%/*.go) + mkdir -p keepproxy/generated/src/git.curoverse.com + ln -sfn ../../../../.. keepproxy/generated/src/git.curoverse.com/arvados.git + GOPATH=$(shell pwd)/keepproxy/generated go get $(@:keepproxy/generated/bin/%=git.curoverse.com/arvados.git/services/%) $(BUILD): mkdir -p build @@ -143,10 +161,10 @@ $(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 +$(KEEP_PROXY_GENERATED): $(KEEP_PROXY_GENERATED_IN) + $(CONFIG_RB) keepproxy + +DOCKER_BUILD = $(DOCKER) build --rm=true # ============================================================ # The main Arvados servers: api, doc, workbench, compute @@ -155,21 +173,17 @@ api-image: passenger-image $(BUILD) $(API_DEPS) @echo "Building api-image" mkdir -p api/generated tar -czf api/generated/api.tar.gz -C build/services api - chmod 755 api/generated/setup.sh - chmod 755 api/generated/setup-gitolite.sh $(DOCKER_BUILD) -t arvados/api api date >api-image shell-image: base-image $(BUILD) $(SHELL_DEPS) @echo "Building shell-image" mkdir -p shell/generated - chmod 755 shell/generated/setup.sh $(DOCKER_BUILD) -t arvados/shell shell date >shell-image compute-image: slurm-image $(BUILD) $(COMPUTE_DEPS) @echo "Building compute-image" - chmod 755 compute/generated/setup.sh $(DOCKER_BUILD) -t arvados/compute compute date >compute-image @@ -185,6 +199,11 @@ keep-image: debian-arvados-image $(BUILD) $(KEEP_DEPS) $(DOCKER_BUILD) -t arvados/keep keep date >keep-image +keep-proxy-image: debian-arvados-image $(BUILD) $(KEEP_PROXY_DEPS) + @echo "Building keep-proxy-image" + $(DOCKER_BUILD) -t arvados/keepproxy keepproxy + date >keep-proxy-image + jobs-image: base-image $(BUILD) $(JOBS_DEPS) $(DOCKER_BUILD) -t arvados/jobs jobs date >jobs-image @@ -211,6 +230,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.