From 29fee810dd128be904354d439f8c85a3318f64f8 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Fri, 14 Dec 2018 16:36:50 -0500
Subject: [PATCH] Set DBName correctly for arvbox demo, hopefully fix
 ci.commonwl.org

no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---
 tools/arvbox/lib/arvbox/docker/service/controller/run | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index c2afc17839..06a9ba7087 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
 
-- 
2.30.2