X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2de827e57ae9ba1b0d322199d071ae900a5b7e0c..a3787ef83a0538097fb6f802f675be740a241ebc:/docker/build_tools/Makefile diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile index 69db746326..f3dd90c6c7 100644 --- a/docker/build_tools/Makefile +++ b/docker/build_tools/Makefile @@ -1,18 +1,50 @@ -all: api-image doc-image workbench-image warehouse-image sso-image +# This is the 'shell hack'. Call make with DUMP=1 to see the effect. +ifdef DUMP +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 + +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 # but does not remove any docker images generated in previous builds clean: - -rm -rf build - -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 + @echo "make clean" + -@rm -rf build + +@[ "$(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/*) +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*) + +# `make realclean' will also remove the Arvados docker images (but not the +# arvados/debian image) 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` + @echo "make realclean" + +@[ "`$(DOCKER) ps -q`" = '' ] || $(DOCKER) stop `$(DOCKER) ps -q` + +@[ "$(REALCLEAN_CONTAINERS)" = '' ] || $(DOCKER) rm $(REALCLEAN_CONTAINERS) + +@[ "$(REALCLEAN_IMAGES)" = '' ] || $(DOCKER) rmi $(REALCLEAN_IMAGES) + +# `make deepclean' will remove all Arvados docker images and the skydns/skydock +# images and force subsequent makes to build the entire chain from the ground up +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) + +@[ "$(SKYDNS_CONTAINERS)" = '' ] || $(DOCKER) rm $(SKYDNS_CONTAINERS) + +@[ "$(SKYDNS_IMAGES)" = '' ] || $(DOCKER) rmi $(SKYDNS_IMAGES) # ============================================================ # Dependencies for */generated files which are prerequisites @@ -22,130 +54,161 @@ CONFIG_RB = build_tools/config.rb BUILD = build/.buildstamp -BASE_DEPS = base/Dockerfile $(BASE_GENERATED) +BASE_DEPS = base/Dockerfile config.yml $(BASE_GENERATED) + +SLURM_DEPS = slurm/Dockerfile config.yml $(SLURM_GENERATED) JOBS_DEPS = jobs/Dockerfile -API_DEPS = api/Dockerfile $(API_GENERATED) +JAVA_BWA_SAMTOOLS_DEPS = java-bwa-samtools/Dockerfile + +API_DEPS = api/* config.yml $(API_GENERATED) + +SHELL_DEPS = shell/* config.yml $(SHELL_GENERATED) + +COMPUTE_DEPS = compute/* config.yml $(COMPUTE_GENERATED) DOC_DEPS = doc/Dockerfile doc/apache2_vhost WORKBENCH_DEPS = workbench/Dockerfile \ - workbench/passenger.conf \ + config.yml \ $(WORKBENCH_GENERATED) -WAREHOUSE_DEPS = warehouse/Dockerfile \ - warehouse/supervisor.conf \ - $(WAREHOUSE_GENERATED) +KEEP_DEPS = keep/Dockerfile config.yml $(KEEP_GENERATED) -SSO_DEPS = sso/passenger.conf $(SSO_GENERATED) +SSO_DEPS = config.yml $(SSO_GENERATED) + +BCBIO_NEXTGEN_DEPS = bcbio-nextgen/Dockerfile BASE_GENERATED = base/generated/arvados.tar.gz -API_GENERATED = \ - api/generated/apache2_vhost \ - api/generated/config_databases.sh \ - api/generated/database.yml \ - api/generated/omniauth.rb \ - api/generated/production.rb \ - api/generated/secret_token.rb \ - api/generated/superuser_token - -API_GENERATED_IN = \ - api/apache2_vhost.in \ - api/config_databases.sh.in \ - api/database.yml.in \ - api/omniauth.rb.in \ - api/production.rb.in \ - api/secret_token.rb.in \ - api/superuser_token.in - -WORKBENCH_GENERATED = \ - workbench/generated/apache2_vhost \ - workbench/generated/production.rb \ - workbench/generated/secret_token.rb - -WORKBENCH_GENERATED_IN = \ - workbench/apache2_vhost.in \ - workbench/production.rb.in \ - workbench/secret_token.rb.in - -WAREHOUSE_GENERATED = warehouse/generated/warehouse.conf - -WAREHOUSE_GENERATED_IN = warehouse/warehouse.conf.in - -SSO_GENERATED = \ - sso/generated/apache2_vhost \ - sso/generated/seeds.rb \ - sso/generated/secret_token.rb - -SSO_GENERATED_IN = \ - sso/apache2_vhost.in \ - sso/seeds.rb.in \ - sso/secret_token.rb.in +COMPUTE_GENERATED_IN = compute/*.in +COMPUTE_GENERATED = compute/generated/* + +KEEP_GENERATED_IN = keep/*.in +KEEP_GENERATED = keep/generated/* + +API_GENERATED_IN = api/*.in +API_GENERATED = api/generated/* + +SHELL_GENERATED_IN = shell/*.in +SHELL_GENERATED = shell/generated/* + +SLURM_GENERATED_IN = slurm/*.in +SLURM_GENERATED = slurm/generated/* + +WORKBENCH_GENERATED_IN = workbench/*.in +WORKBENCH_GENERATED = workbench/generated/* + +SSO_GENERATED_IN = sso/*.in +SSO_GENERATED = sso/generated/* + +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/%) $(BUILD): mkdir -p build rsync -rlp --exclude=docker/ --exclude='**/log/*' --exclude='**/tmp/*' \ --chmod=Da+rx,Fa+rX ../ build/ find build/ -name \*.gem -delete - cd build/sdk/python/ && ./build.sh + cd build/services/fuse/ && python setup.py build + cd build/sdk/python/ && python setup.py build cd build/sdk/cli && gem build arvados-cli.gemspec cd build/sdk/ruby && gem build arvados.gemspec touch build/.buildstamp -$(BASE_GENERATED): config.yml $(BUILD) - $(CONFIG_RB) +$(SLURM_GENERATED): $(BUILD) + $(CONFIG_RB) slurm + mkdir -p slurm/generated + +$(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 + +$(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 -$(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN) - $(CONFIG_RB) +$(SSO_GENERATED): $(SSO_GENERATED_IN) + $(CONFIG_RB) sso -$(SSO_GENERATED): config.yml $(SSO_GENERATED_IN) - $(CONFIG_RB) +$(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 +DOCKER_BUILD = $(DOCKER) build -q --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 $(DOCKER_BUILD) -t arvados/api api date >api-image +shell-image: base-image $(BUILD) $(SHELL_DEPS) + @echo "Building shell-image" + mkdir -p shell/generated + $(DOCKER_BUILD) -t arvados/shell shell + date >shell-image + +compute-image: slurm-image $(BUILD) $(COMPUTE_DEPS) + @echo "Building compute-image" + $(DOCKER_BUILD) -t arvados/compute compute + date >compute-image + doc-image: base-image $(BUILD) $(DOC_DEPS) + @echo "Building doc-image" mkdir -p doc/generated tar -czf doc/generated/doc.tar.gz -C build doc $(DOCKER_BUILD) -t arvados/doc doc date >doc-image +keep-image: debian-arvados-image $(BUILD) $(KEEP_DEPS) + @echo "Building keep-image" + $(DOCKER_BUILD) -t arvados/keep keep + date >keep-image + jobs-image: base-image $(BUILD) $(JOBS_DEPS) $(DOCKER_BUILD) -t arvados/jobs jobs date >jobs-image +java-bwa-samtools-image: jobs-image $(BUILD) $(JAVA_BWA_SAMTOOLS_DEPS) + $(DOCKER_BUILD) -t arvados/jobs-java-bwa-samtools java-bwa-samtools + date >java-bwa-samtools-image + +bcbio-nextgen-image: $(BUILD) $(BASE_GENERATED) $(BCBIO_NEXTGEN_DEPS) + rm -rf bcbio-nextgen/generated + cp -r base/generated bcbio-nextgen + $(DOCKER_BUILD) -t arvados/bcbio-nextgen bcbio-nextgen + date >bcbio-nextgen-image + workbench-image: passenger-image $(BUILD) $(WORKBENCH_DEPS) + @echo "Building workbench-image" mkdir -p workbench/generated tar -czf workbench/generated/workbench.tar.gz -C build/apps workbench $(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 @@ -154,13 +217,31 @@ sso-image: passenger-image $(SSO_DEPS) # that are dependencies for every Arvados service. passenger-image: base-image + @echo "Building passenger-image" $(DOCKER_BUILD) -t arvados/passenger passenger date >passenger-image -base-image: debian-image $(BASE_DEPS) +slurm-image: base-image $(SLURM_DEPS) + @echo "Building slurm-image" + $(DOCKER_BUILD) -t arvados/slurm slurm + date >slurm-image + +base-image: debian-arvados-image $(BASE_DEPS) + @echo "Building base-image" $(DOCKER_BUILD) -t arvados/base base date >base-image -debian-image: +debian-arvados-image: + @echo "Building debian-arvados-image" ./mkimage-debootstrap.sh arvados/debian wheezy ftp://ftp.us.debian.org/debian/ - date >debian-image + date >debian-arvados-image + +skydns-image: + @echo "Downloading skydns-image" + $(DOCKER) pull crosbymichael/skydns + date >skydns-image + +skydock-image: + @echo "Downloading skydock-image" + $(DOCKER) pull crosbymichael/skydock + date >skydock-image