[ARVADOS-DEV] updated: aa65f4dc68b750a635c857c0480df3f5a2dca7a4

[git at public.curoverse.com]

Summary of changes:
 arvbox/lib/arvbox/docker/Dockerfile.base                 | 16 ++++++++++++----
 .../log/main/.gitstub                                    |  0
 .../service/{workbench => crunch-dispatch-local}/log/run |  0
 .../docker/service/{sso => crunch-dispatch-local}/run    |  0
 .../{keep-web => crunch-dispatch-local}/run-service      |  7 ++++---
 5 files changed, 16 insertions(+), 7 deletions(-)
 copy arvbox/lib/arvbox/docker/service/{workbench => crunch-dispatch-local}/log/main/.gitstub (100%)
 copy arvbox/lib/arvbox/docker/service/{workbench => crunch-dispatch-local}/log/run (100%)
 copy arvbox/lib/arvbox/docker/service/{sso => crunch-dispatch-local}/run (100%)
 copy arvbox/lib/arvbox/docker/service/{keep-web => crunch-dispatch-local}/run-service (62%)

       via  aa65f4dc68b750a635c857c0480df3f5a2dca7a4 (commit)
       via  819ffb0ad38eb1f86ab6b6e3c4ae7c860b465636 (commit)
      from  6f19089ca96e485f457932dce44256e46f1e3711 (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 aa65f4dc68b750a635c857c0480df3f5a2dca7a4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Feb 15 16:37:00 2016 -0500

    Explicitly install Docker 1.9.1 instead of using get.dockerproject.org (which gets the latest). no issue #

diff --git a/arvbox/lib/arvbox/docker/Dockerfile.base b/arvbox/lib/arvbox/docker/Dockerfile.base
index c0dc767..160afee 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -9,13 +9,21 @@ RUN apt-get update && \
     libpython-dev fuse libfuse-dev python-pip python-yaml \
     pkg-config libattr1-dev python-llfuse python-pycurl \
     libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
-    libjson-perl nginx gitolite3 lsof python-epydoc graphviz
+    libjson-perl nginx gitolite3 lsof python-epydoc graphviz \
+    apt-transport-https ca-certificates
 
-RUN curl -sSL https://get.docker.com/ | sh
 VOLUME /var/lib/docker
 VOLUME /var/log/nginx
 VOLUME /etc/ssl/private
 
+RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D || \
+    apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+
+RUN mkdir -p /etc/apt/sources.list.d && \
+    echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install docker-engine=1.9.1-0~jessie
+
 RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql
 
 RUN cd /root && \
@@ -30,8 +38,8 @@ ADD crunch-setup.sh gitolite.rc \
     application_yml_override.py \
     /usr/local/lib/arvbox/
 
-ADD service/ /usr/local/lib/arvbox/service
-RUN rmdir /etc/service && ln -sf /usr/local/lib/arvbox/service /etc
+ADD service/ /var/lib/arvbox/service
+RUN rmdir /etc/service && ln -sf /var/lib/arvbox/service /etc
 
 # Start the supervisor.
 CMD ["/usr/local/bin/runsvinit"]

commit 819ffb0ad38eb1f86ab6b6e3c4ae7c860b465636
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Sat Feb 13 23:18:27 2016 -0500

    Add crunch-dispatch-local to arvbox.  no issue #

diff --git a/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/log/main/.gitstub b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/log/main/.gitstub
new file mode 100644
index 0000000..e69de29
diff --git a/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/log/run b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/log/run
new file mode 120000
index 0000000..d6aef4a
--- /dev/null
+++ b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/log/run
@@ -0,0 +1 @@
+/usr/local/lib/arvbox/logger
\ No newline at end of file
diff --git a/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run
new file mode 120000
index 0000000..a388c8b
--- /dev/null
+++ b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run
@@ -0,0 +1 @@
+/usr/local/lib/arvbox/runsu.sh
\ No newline at end of file
diff --git a/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
new file mode 100755
index 0000000..211b438
--- /dev/null
+++ b/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+exec 2>&1
+set -eux -o pipefail
+
+. /usr/local/lib/arvbox/common.sh
+
+mkdir -p /var/lib/arvados/gostuff
+cd /var/lib/arvados/gostuff
+
+export GOPATH=$PWD
+mkdir -p "$GOPATH/src/git.curoverse.com"
+ln -sfn "/usr/src/arvados" "$GOPATH/src/git.curoverse.com/arvados.git"
+flock /var/lib/arvados/gostuff.lock go get -t "git.curoverse.com/arvados.git/services/crunch-run"
+flock /var/lib/arvados/gostuff.lock go get -t "git.curoverse.com/arvados.git/services/crunch-dispatch-local"
+install bin/crunch-run bin/crunch-dispatch-local /usr/local/bin
+
+export ARVADOS_API_HOST=$localip:${services[api]}
+export ARVADOS_API_HOST_INSECURE=1
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+
+exec /usr/local/bin/crunch-dispatch-local -crunch-run-command=/usr/local/bin/crunch-run

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


hooks/post-receive
--