projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crunch-job passes ARVADOS envvars to Docker.
[arvados.git]
/
docker
/
build_tools
/
Makefile
diff --git
a/docker/build_tools/Makefile
b/docker/build_tools/Makefile
index 9eac2ec61cbe4b6462f98f2ecf5589de17d4f2cf..298551fa1566b9b62ce3b588a8230e5c42cbc22b 100644
(file)
--- a/
docker/build_tools/Makefile
+++ b/
docker/build_tools/Makefile
@@
-24,6
+24,8
@@
BUILD = build/.buildstamp
BASE_DEPS = base/Dockerfile $(BASE_GENERATED)
BASE_DEPS = base/Dockerfile $(BASE_GENERATED)
+JOBS_DEPS = jobs/Dockerfile
+
API_DEPS = api/Dockerfile $(API_GENERATED)
DOC_DEPS = doc/Dockerfile doc/apache2_vhost
API_DEPS = api/Dockerfile $(API_GENERATED)
DOC_DEPS = doc/Dockerfile doc/apache2_vhost
@@
-86,6
+88,11
@@
$(BUILD):
mkdir -p build
rsync -rlp --exclude=docker/ --exclude='**/log/*' --exclude='**/tmp/*' \
--chmod=Da+rx,Fa+rX ../ 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/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)
touch build/.buildstamp
$(BASE_GENERATED): config.yml $(BUILD)
@@
-125,6
+132,10
@@
doc-image: base-image $(BUILD) $(DOC_DEPS)
$(DOCKER_BUILD) -t arvados/doc doc
date >doc-image
$(DOCKER_BUILD) -t arvados/doc doc
date >doc-image
+jobs-image: base-image $(BUILD) $(JOBS_DEPS)
+ $(DOCKER_BUILD) -t arvados/jobs jobs
+ date >jobs-image
+
workbench-image: passenger-image $(BUILD) $(WORKBENCH_DEPS)
mkdir -p workbench/generated
tar -czf workbench/generated/workbench.tar.gz -C build/apps workbench
workbench-image: passenger-image $(BUILD) $(WORKBENCH_DEPS)
mkdir -p workbench/generated
tar -czf workbench/generated/workbench.tar.gz -C build/apps workbench