[ARVADOS-DEV] updated: 1fd2d0cc54423adb0e0fd3676af15a7ace42f468

[git at public.curoverse.com]

Summary of changes:
 arvbox/arvbox | 92 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

       via  1fd2d0cc54423adb0e0fd3676af15a7ace42f468 (commit)
      from  7c7c2f10db25a1af16a523677444c802c66c807b (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 1fd2d0cc54423adb0e0fd3676af15a7ace42f468
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Sun Dec 27 16:53:28 2015 -0500

    8080: Easier support for multiple containers.  Rename tests -> run-tests.  Refactor run()

diff --git a/arvbox/arvbox b/arvbox/arvbox
index 931a248..ed31d9b 100755
--- a/arvbox/arvbox
+++ b/arvbox/arvbox
@@ -16,14 +16,14 @@ if test -z "$SSO_ROOT" ; then
     SSO_ROOT=$ARVBOX/sso-devise-omniauth-provider
 fi
 
-if test -z "$ARVBOX_DATA" ; then
-    ARVBOX_DATA=$HOME/.arvbox
-fi
-
 if test -z "$ARVBOX_CONTAINER" ; then
     ARVBOX_CONTAINER=arvbox
 fi
 
+if test -z "$ARVBOX_DATA" ; then
+    ARVBOX_DATA=$HOME/.arvbox/$ARVBOX_CONTAINER
+fi
+
 PASSENGER=$ARVBOX_DATA/passenger
 PG_DATA=$ARVBOX_DATA/postgres
 ARV_DATA=$ARVBOX_DATA/var
@@ -38,33 +38,48 @@ run() {
         git clone https://github.com/curoverse/sso-devise-omniauth-provider.git $SSO_ROOT
     fi
 
-    docker run \
-           --detach \
-           --name=$ARVBOX_CONTAINER \
-           --privileged \
-           --volume=$ARVADOS_ROOT:/usr/src/arvados:rw \
-           --volume=$SSO_ROOT:/usr/src/sso:rw \
-           --volume=$PG_DATA:/var/lib/postgresql:rw \
-           --volume=$ARV_DATA:/var/lib/arvados:rw \
-           --volume=$PASSENGER:/var/lib/passenger:rw \
-           --volume=/var/lib/docker \
-           arvados/arvbox
-
-    FF=/tmp/arvbox-fifo-$$
-    mkfifo $FF
-    docker logs -f $ARVBOX_CONTAINER > $FF &
-    LOGPID=$!
-    while read line ; do
-        echo $line
-        if echo $line | grep "Workbench is running at" >/dev/null ; then
-            kill $LOGPID
-        fi
-    done < $FF
-    rm $FF
+    if test "$1" = testing ; then
+        docker run \
+               --detach \
+               --name=$ARVBOX_CONTAINER \
+               --privileged \
+               --volume=$ARVADOS_ROOT:/usr/src/arvados:rw \
+               --volume=$ARVADOS_DEV_ROOT:/usr/src/arvados-dev:rw \
+               --volume=$SSO_ROOT:/usr/src/sso:rw \
+               --volume=$PG_DATA:/var/lib/postgresql:rw \
+               --volume=$ARV_DATA:/var/lib/arvados:rw \
+               --volume=$PASSENGER:/var/lib/passenger:rw \
+               --volume=/var/lib/docker \
+               arvados/arvbox \
+               runsvdir /etc/tests-service
+    else
+        docker run \
+               --detach \
+               --name=$ARVBOX_CONTAINER \
+               --privileged \
+               --volume=$ARVADOS_ROOT:/usr/src/arvados:rw \
+               --volume=$SSO_ROOT:/usr/src/sso:rw \
+               --volume=$PG_DATA:/var/lib/postgresql:rw \
+               --volume=$ARV_DATA:/var/lib/arvados:rw \
+               --volume=$PASSENGER:/var/lib/passenger:rw \
+               --volume=/var/lib/docker \
+               arvados/arvbox
+        FF=/tmp/arvbox-fifo-$$
+        mkfifo $FF
+        docker logs -f $ARVBOX_CONTAINER > $FF &
+        LOGPID=$!
+        while read line ; do
+            echo $line
+            if echo $line | grep "Workbench is running at" >/dev/null ; then
+                kill $LOGPID
+            fi
+        done < $FF
+        rm $FF
+    fi
 }
 
 stop() {
-    if docker ps |grep -E "\b$ARVBOX_CONTAINER\b" -q ; then
+    if docker ps -a |grep -E "\b$ARVBOX_CONTAINER\b" -q ; then
         docker stop $ARVBOX_CONTAINER
         docker rm $ARVBOX_CONTAINER
     fi
@@ -123,26 +138,14 @@ case $1 in
         docker exec -ti $ARVBOX_CONTAINER tail -n40 /etc/service/$2/log/main/current
         ;;
 
-    tests)
+    run-tests)
         stop
 
         if ! test -d $ARVADOS_DEV_ROOT ; then
             git clone https://github.com/curoverse/arvados-dev.git $ARVADOS_DEV_ROOT
         fi
 
-        docker run \
-               --detach \
-               --name=$ARVBOX_CONTAINER \
-               --privileged \
-               --volume=$ARVADOS_ROOT:/usr/src/arvados:rw \
-               --volume=$ARVADOS_DEV_ROOT:/usr/src/arvados-dev:rw \
-               --volume=$SSO_ROOT:/usr/src/sso:rw \
-               --volume=$PG_DATA:/var/lib/postgresql:rw \
-               --volume=$ARV_DATA:/var/lib/arvados:rw \
-               --volume=$PASSENGER:/var/lib/passenger:rw \
-               --volume=/var/lib/docker \
-               arvados/arvbox \
-               runsvdir /etc/tests-service
+        run testing
 
         shift
         docker exec -ti $ARVBOX_CONTAINER /usr/src/arvados-dev/jenkins/run-tests.sh \
@@ -154,11 +157,8 @@ case $1 in
                GEMHOME=/var/lib/arvados/gems \
                GEM_HOME=/var/lib/arvados/gems \
                "$@"
-        docker stop $ARVBOX_CONTAINER
-        docker rm $ARVBOX_CONTAINER
         ;;
 
-
     *)
         echo "Arvados-in-a-box"
         echo
@@ -174,6 +174,6 @@ case $1 in
         echo "reset      delete persistent data (careful!)"
         echo "log <component>       tail log of specified service"
         echo "svrestart <component> restart specified service inside arvbox"
-        echo "tests      run run-tests.sh inside $ARVBOX_CONTAINER container"
+        echo "run-tests  run run-tests.sh inside $ARVBOX_CONTAINER container"
         ;;
 esac

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


hooks/post-receive
--