[ARVADOS] updated: 1.3.0-59-g29fee810d

Git user git at public.curoverse.com
Fri Dec 14 16:37:49 EST 2018


Summary of changes:
 tools/arvbox/lib/arvbox/docker/service/controller/run | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

       via  29fee810dd128be904354d439f8c85a3318f64f8 (commit)
      from  cec011b7718536de42ebd683aa96bee92cbca06c (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 29fee810dd128be904354d439f8c85a3318f64f8
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Dec 14 16:36:50 2018 -0500

    Set DBName correctly for arvbox demo, hopefully fix ci.commonwl.org
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index c2afc1783..06a9ba708 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -20,6 +20,12 @@ fi
 uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
 database_pw=$(cat /var/lib/arvados/api_database_pw)
 
+if test -s /var/lib/arvados/api_rails_env ; then
+  database_env=$(cat /var/lib/arvados/api_rails_env)
+else
+  database_env=development
+fi
+
 mkdir -p /etc/arvados
 
 cat >/var/lib/arvados/cluster_config.yml <<EOF
@@ -39,7 +45,7 @@ Clusters:
         Host: localhost
         User: arvados
         Password: ${database_pw}
-        DBName: arvados_development
+        DBName: arvados_${database_env}
         client_encoding: utf8
 EOF
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list