X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/57d004018f00b864dc883d9ff1ed508e57396095..346a55897f4e4a2a26a1a84665f860c000b3da7d:/docker/build_tools/Makefile diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile index c30dbd3c79..7570296013 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,14 +14,20 @@ 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_IMAGES := $(shell $(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE) 2>/dev/null) -DEEPCLEAN_IMAGES := $(shell $(DOCKER) images -q arvados/*) +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' ') +# Generate a list of docker images tagged as arvados/* +# but exclude those tagged as arvados/build +ADI_TEMPFILE := $(shell mktemp) +ARVADOS_DOCKER_IMAGES := $(shell $(DOCKER) images -q arvados/* |sort > $(ADI_TEMPFILE)) +ABDI_TEMPFILE := $(shell mktemp) +ARVADOS_BUILD_DOCKER_IMAGES := $(shell $(DOCKER) images -q arvados/build |sort > $(ABDI_TEMPFILE)) +REALCLEAN_IMAGES := $(shell comm -3 $(ADI_TEMPFILE) $(ABDI_TEMPFILE) |grep -v $(DEBIAN_IMAGE) 2>/dev/null) +DEEPCLEAN_IMAGES := $(shell comm -3 $(ADI_TEMPFILE) $(ABDI_TEMPFILE)) SKYDNS_CONTAINERS := $(shell $(DOCKER) ps -a |grep -e crosbymichael/skydns -e crosbymichael/skydock |cut -f 1 -d' ') SKYDNS_IMAGES := $(shell $(DOCKER) images -q crosbymichael/skyd*) @@ -40,6 +45,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,57 +58,79 @@ deepclean: clean CONFIG_RB = build_tools/config.rb -LIST_GENERATED_FILES = build_tools/list_generated_files - BUILD = build/.buildstamp -BASE_DEPS = base/Dockerfile $(BASE_GENERATED) +BASE_DEPS = base/Dockerfile config.yml $(BASE_GENERATED) -SLURM_DEPS = slurm/Dockerfile $(SLURM_GENERATED) +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/* $(API_GENERATED) +API_DEPS = api/* config.yml $(API_GENERATED) -SHELL_DEPS = shell/* $(SHELL_GENERATED) +SHELL_DEPS = shell/* config.yml $(SHELL_GENERATED) -COMPUTE_DEPS = compute/* $(COMPUTE_GENERATED) +COMPUTE_DEPS = compute/* config.yml $(COMPUTE_GENERATED) -DOC_DEPS = doc/Dockerfile doc/apache2_vhost +DOC_DEPS = doc/Dockerfile $(DOC_GENERATED) WORKBENCH_DEPS = workbench/Dockerfile \ + config.yml \ $(WORKBENCH_GENERATED) -KEEP_DEPS = keep/Dockerfile $(KEEP_GENERATED) +KEEP_DEPS = keep/Dockerfile config.yml $(KEEP_GENERATED) + +KEEP_PROXY_DEPS = keepproxy/Dockerfile config.yml $(KEEP_PROXY_GENERATED) -SSO_DEPS = $(SSO_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/* + +API_GENERATED_IN = api/*.in +API_GENERATED = api/generated/* -KEEP_GENERATED_IN = $(shell ls keep/*.in) -KEEP_GENERATED = $(shell $(LIST_GENERATED_FILES) $(KEEP_GENERATED_IN)) +SHELL_GENERATED_IN = shell/*.in +SHELL_GENERATED = shell/generated/* -API_GENERATED_IN = $(shell ls api/*.in) -API_GENERATED = $(shell $(LIST_GENERATED_FILES) $(API_GENERATED_IN)) +SLURM_GENERATED_IN = slurm/*.in +SLURM_GENERATED = slurm/generated/* -SHELL_GENERATED_IN = $(shell ls shell/*.in) -SHELL_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SHELL_GENERATED_IN)) +WORKBENCH_GENERATED_IN = workbench/*.in +WORKBENCH_GENERATED = workbench/generated/* -SLURM_GENERATED_IN = $(shell ls slurm/*.in) -SLURM_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SLURM_GENERATED_IN)) +SSO_GENERATED_IN = sso/*.in +SSO_GENERATED = sso/generated/* -WORKBENCH_GENERATED_IN = $(shell ls workbench/*.in) -WORKBENCH_GENERATED = $(shell $(LIST_GENERATED_FILES) $(WORKBENCH_GENERATED_IN)) +DOC_GENERATED_IN = doc/*.in +DOC_GENERATED = doc/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 @@ -115,63 +143,59 @@ $(BUILD): cd build/sdk/ruby && gem build arvados.gemspec touch build/.buildstamp -$(SLURM_GENERATED): config.yml $(BUILD) - $(CONFIG_RB) +$(SLURM_GENERATED): $(BUILD) + $(CONFIG_RB) slurm mkdir -p slurm/generated -$(BASE_GENERATED): config.yml $(BUILD) - $(CONFIG_RB) +$(BASE_GENERATED): $(BUILD) + $(CONFIG_RB) base mkdir -p base/generated tar -czf base/generated/arvados.tar.gz -C build . -$(API_GENERATED): config.yml $(API_GENERATED_IN) - $(CONFIG_RB) +$(API_GENERATED): $(API_GENERATED_IN) + $(CONFIG_RB) api + +$(SHELL_GENERATED): $(SHELL_GENERATED_IN) + $(CONFIG_RB) shell -$(SHELL_GENERATED): config.yml $(SHELL_GENERATED_IN) - $(CONFIG_RB) +$(WORKBENCH_GENERATED): $(WORKBENCH_GENERATED_IN) + $(CONFIG_RB) workbench -$(WORKBENCH_GENERATED): config.yml $(WORKBENCH_GENERATED_IN) - $(CONFIG_RB) +$(COMPUTE_GENERATED): $(COMPUTE_GENERATED_IN) + $(CONFIG_RB) compute -$(COMPUTE_GENERATED): config.yml $(COMPUTE_GENERATED_IN) - $(CONFIG_RB) +$(SSO_GENERATED): $(SSO_GENERATED_IN) + $(CONFIG_RB) sso -$(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN) - $(CONFIG_RB) +$(DOC_GENERATED): $(DOC_GENERATED_IN) + $(CONFIG_RB) doc -$(SSO_GENERATED): config.yml $(SSO_GENERATED_IN) - $(CONFIG_RB) +$(KEEP_GENERATED): $(KEEP_GENERATED_IN) + $(CONFIG_RB) keep -$(KEEP_GENERATED): config.yml $(KEEP_GENERATED_IN) - $(CONFIG_RB) +$(KEEP_PROXY_GENERATED): $(KEEP_PROXY_GENERATED_IN) + $(CONFIG_RB) keepproxy -# 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, warehouse +# The main Arvados servers: api, doc, workbench, compute 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 @@ -187,7 +211,12 @@ keep-image: debian-arvados-image $(BUILD) $(KEEP_DEPS) $(DOCKER_BUILD) -t arvados/keep keep date >keep-image -jobs-image: base-image $(BUILD) $(JOBS_DEPS) +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: debian-arvados-image $(BUILD) $(JOBS_DEPS) $(DOCKER_BUILD) -t arvados/jobs jobs date >jobs-image @@ -208,15 +237,15 @@ workbench-image: passenger-image $(BUILD) $(WORKBENCH_DEPS) $(DOCKER_BUILD) -t arvados/workbench workbench date >workbench-image -warehouse-image: base-image $(WAREHOUSE_DEPS) - $(DOCKER_BUILD) -t arvados/warehouse warehouse - date >warehouse-image - sso-image: passenger-image $(SSO_DEPS) @echo "Building 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. @@ -238,7 +267,7 @@ base-image: debian-arvados-image $(BASE_DEPS) debian-arvados-image: @echo "Building debian-arvados-image" - ./mkimage-debootstrap.sh arvados/debian wheezy ftp://ftp.us.debian.org/debian/ + ./mkimage-debootstrap.sh arvados/debian wheezy http://ftp.us.debian.org/debian/ date >debian-arvados-image skydns-image: