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 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)
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)
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)
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_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/%)
$(BUILD):
mkdir -p build
@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