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
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' ')
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)
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_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
-SLURM_GENERATED = slurm/generated/*
-
-COMPUTE_GENERATED = compute/generated/setup.sh
-
-COMPUTE_GENERATED_IN = compute/setup.sh.in
-
-API_GENERATED = \
- api/generated/arvados-clients.yml \
- api/generated/apache2_vhost \
- api/generated/config_databases.sh \
- api/generated/database.yml \
- api/generated/omniauth.rb \
- api/generated/application.yml \
- api/generated/setup.sh \
- api/generated/setup-gitolite.sh \
- api/generated/slurm.conf \
- api/generated/superuser_token
-
-API_GENERATED_IN = \
- api/arvados-clients.yml.in \
- api/apache2_vhost.in \
- api/config_databases.sh.in \
- api/database.yml.in \
- api/omniauth.rb.in \
- api/application.yml.in \
- api/setup.sh.in \
- api/setup-gitolite.sh.in \
- api/slurm.conf.in \
- api/superuser_token.in
-
-SHELL_GENERATED = \
- shell/generated/setup.sh \
- shell/generated/superuser_token
-
-SHELL_GENERATED_IN = \
- shell/setup.sh.in \
- shell/superuser_token.in
-
-SLURM_GENERATED = \
- slurm/generated/slurm.conf
-
-SLURM_GENERATED_IN = \
- slurm/slurm.conf.in
-
-WORKBENCH_GENERATED = \
- workbench/generated/apache2_vhost \
- workbench/generated/application.yml
-
-WORKBENCH_GENERATED_IN = \
- workbench/apache2_vhost.in \
- workbench/application.yml.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/*
+
+KEEP_PROXY_GENERATED_IN = keepproxy/*.in
+KEEP_PROXY_GENERATED = keepproxy/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/*
+
+DOC_GENERATED_IN = doc/*.in
+DOC_GENERATED = doc/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/%)
+
+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
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)
+$(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
-# 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, 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
$(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
$(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.
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:
projects / arvados.git / blobdiff