Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

[arvados.git] / tools / arvbox / lib / arvbox / docker / api-setup.sh

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index 14b4ac29981afaf8fb843b1267efcb3bcd771659..1618c11e42d4e2378cc7ca076f10b2ba67a9b44f 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -9,7 +9,12 @@ set -ex -o pipefail
 . /usr/local/lib/arvbox/common.sh
 
 cd /usr/src/arvados/services/api
-export RAILS_ENV=development
+
+if test -s /var/lib/arvados/api_rails_env ; then
+  export RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+  export RAILS_ENV=development
+fi
 
 set -u
 
@@ -41,7 +46,7 @@ else
 fi
 
 cat >config/application.yml <<EOF
-development:
+$RAILS_ENV:
   uuid_prefix: $uuid_prefix
   secret_token: $secret_token
   blob_signing_key: $blob_signing_key
@@ -59,7 +64,8 @@ development:
   auto_setup_new_users_with_vm_uuid: $vm_uuid
   auto_setup_new_users_with_repository: true
   default_collection_replication: 1
-  docker_image_formats: ["v1"]
+  docker_image_formats: ["v2"]
+  keep_web_service_url: http://$localip:${services[keep-web]}/
 EOF
 
 (cd config && /usr/local/lib/arvbox/application_yml_override.py)