[ARVADOS-DEV] updated: 91cc6e31cf0ad3cc43a45eb2dc7d30c2ae6158d7

[git at public.curoverse.com]

Summary of changes:
 arvbox/arvbox                 | 16 ++++++++++------
 arvbox/docker/service/api/run |  6 +++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

       via  91cc6e31cf0ad3cc43a45eb2dc7d30c2ae6158d7 (commit)
      from  bfa7362c90e3bf5f42ac30612c0ec04ed9deb0d6 (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 91cc6e31cf0ad3cc43a45eb2dc7d30c2ae6158d7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 4 14:26:30 2016 -0500

    8080: Test configuration uses "zzzzz" prefix, which fixes almost all the failing
    tests.

diff --git a/arvbox/arvbox b/arvbox/arvbox
index ac1e604..f6e95cb 100755
--- a/arvbox/arvbox
+++ b/arvbox/arvbox
@@ -79,9 +79,7 @@ run() {
         done < $FF
         rm $FF
         echo
-        echo "You the Arvados source code is checked out at $ARVADOS_ROOT"
-        echo "Use '$0 reboot' to restart the container"
-        echo "or '$0 svrestart' to recompile/reconfigure/restart individual services."
+        echo "The Arvados source code is checked out at: $ARVADOS_ROOT"
     fi
 }
 
@@ -110,6 +108,11 @@ case $1 in
         stop
         ;;
 
+    restart)
+        stop
+        run
+        ;;
+
     reboot)
         stop
         cd $ARVBOX_SCRIPT
@@ -182,9 +185,10 @@ case $1 in
         echo "open       open arvbox workbench in a web browser"
         echo "shell      enter arvbox shell"
         echo "ip         print arvbox ip address"
-        echo "stop       stop arvbox"
-        echo "reboot     stop arvbox, build image, run"
-        echo "reset      delete persistent data (be careful!)"
+        echo "stop       stop arvbox container"
+        echo "restart    stop, then run again"
+        echo "reboot     stop, build arvbox Docker image, run"
+        echo "reset      delete all persistent data (be careful!)"
         echo "run-tests  run run-tests.sh inside $ARVBOX_CONTAINER container"
         echo "log       <service> tail log of specified service"
         echo "svrestart <service> restart specified service inside arvbox"
diff --git a/arvbox/docker/service/api/run b/arvbox/docker/service/api/run
index 5c80964..419235d 100755
--- a/arvbox/docker/service/api/run
+++ b/arvbox/docker/service/api/run
@@ -32,7 +32,6 @@ sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
 
 cat >config/application.yml <<EOF
 common:
-  uuid_prefix: $uuid_prefix
   secret_token: $secret_token
   blob_signing_key: $blob_signing_key
   sso_app_secret: $sso_app_secret
@@ -43,6 +42,11 @@ common:
   auto_admin_first_user: true
   git_repo_ssh_base: "git@$localip:"
   git_repo_https_base: "http://$localip:9001/"
+development:
+  uuid_prefix: $uuid_prefix
+test:
+  uuid_prefix: zzzzz
+  git_repo_ssh_base: "git at git.zzzzz.arvadosapi.com:"
 EOF
 
 if ! test -f /var/lib/arvados/api_database_pw ; then

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


hooks/post-receive
--