[ARVADOS] updated: 15f2a2c449095c4be2d41d2cd6915ca07ae07644

[git at public.curoverse.com]

Summary of changes:
 docker/Makefile       |   14 +++++++-------
 docker/api/Dockerfile |   12 +++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

       via  15f2a2c449095c4be2d41d2cd6915ca07ae07644 (commit)
      from  eff9d0deac0e06f7310ba1463aab89b342e71aa9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 15f2a2c449095c4be2d41d2cd6915ca07ae07644
Author: Tim Pierce <twp at clinicalfuture.com>
Date:   Mon Dec 23 19:04:07 2013 -0500

    Undo `docker build' hack fixed in docker 0.7; add git repo to support JobsController.
    
    `docker build' bug #1875 supposedly fixed in https://github.com/dotcloud/docker/commit/751250015bbecd9d8c4158b7a8398b3dc2eccde4

diff --git a/docker/Makefile b/docker/Makefile
index b365b70..3b21b43 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -88,27 +88,27 @@ $(SSO_GENERATED): config.yml $(SSO_GENERATED_IN)
 api-image: passenger-image $(API_DEPS)
 	mkdir -p api/generated
 	tar -c -z -f api/generated/api.tar.gz -C ../services api
-	./docker_build -t arvados/api api
+	docker build -t arvados/api api
 	echo -n "Built at $(date)" > api-image
 
 doc-image: base-image $(DOC_DEPS)
 	mkdir -p doc/generated
 	tar -c -z -f doc/generated/doc.tar.gz -C .. doc
-	./docker_build -t arvados/doc doc
+	docker build -t arvados/doc doc
 	echo -n "Built at $(date)" > doc-image
 
 workbench-image: passenger-image $(WORKBENCH_DEPS)
 	mkdir -p workbench/generated
 	tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
-	./docker_build -t arvados/workbench workbench
+	docker build -t arvados/workbench workbench
 	echo -n "Built at $(date)" > workbench-image
 
 warehouse-image: base-image $(WAREHOUSE_DEPS)
-	./docker_build -t arvados/warehouse warehouse
+	docker build -t arvados/warehouse warehouse
 	echo -n "Built at $(date)" > warehouse-image
 
 sso-image: passenger-image $(SSO_DEPS)
-	./docker_build -t arvados/sso sso
+	docker build -t arvados/sso sso
 	echo -n "Built at $(date)" > sso-image
 
 # ============================================================
@@ -116,11 +116,11 @@ sso-image: passenger-image $(SSO_DEPS)
 # that are dependencies for every Arvados service.
 
 passenger-image: base-image
-	./docker_build -t arvados/passenger passenger
+	docker build -t arvados/passenger passenger
 	echo -n "Built at $(date)" > passenger-image
 
 base-image: debian-image $(BASE_DEPS)
-	./docker_build -t arvados/base base
+	docker build -t arvados/base base
 	echo -n "Built at $(date)" > base-image
 
 debian-image:
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 7a87beb..4401ac0 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -3,9 +3,15 @@
 FROM arvados/passenger
 MAINTAINER Tim Pierce <twp at clinicalfuture.com>
 
-# Install postgres and apache
-RUN apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2 \
-                          supervisor
+# Install postgres and apache.
+# Clone a git repository of Arvados source -- not used to build, but
+# will be used by the Commit model and anything else that needs to
+# check a git repo for crunch scripts.
+#
+RUN apt-get update && \
+    apt-get -q -y install procps postgresql postgresql-server-dev-9.1 apache2 \
+                          supervisor && \
+    git clone git://github.com/curoverse/arvados.git /var/cache/git/arvados.git
 
 RUN /bin/mkdir -p /usr/src/arvados/services
 ADD generated/api.tar.gz /usr/src/arvados/services/

-----------------------------------------------------------------------


hooks/post-receive
--