projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 d4ff7c94dd3738c44a838e26eb06a3bc2ef6b5d7..1618c11e42d4e2378cc7ca076f10b2ba67a9b44f 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/
tools/arvbox/lib/arvbox/docker/api-setup.sh
@@
-1,4
+1,7
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
exec 2>&1
set -ex -o pipefail
exec 2>&1
set -ex -o pipefail
@@
-6,7
+9,12
@@
set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/arvados/services/api
. /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
set -u
@@
-38,7
+46,7
@@
else
fi
cat >config/application.yml <<EOF
fi
cat >config/application.yml <<EOF
-
development
:
+
$RAILS_ENV
:
uuid_prefix: $uuid_prefix
secret_token: $secret_token
blob_signing_key: $blob_signing_key
uuid_prefix: $uuid_prefix
secret_token: $secret_token
blob_signing_key: $blob_signing_key
@@
-56,6
+64,8
@@
development:
auto_setup_new_users_with_vm_uuid: $vm_uuid
auto_setup_new_users_with_repository: true
default_collection_replication: 1
auto_setup_new_users_with_vm_uuid: $vm_uuid
auto_setup_new_users_with_repository: true
default_collection_replication: 1
+ docker_image_formats: ["v2"]
+ keep_web_service_url: http://$localip:${services[keep-web]}/
EOF
(cd config && /usr/local/lib/arvbox/application_yml_override.py)
EOF
(cd config && /usr/local/lib/arvbox/application_yml_override.py)
@@
-78,7
+88,8
@@
if ! test -f /var/lib/arvados/api_database_setup ; then
fi
if ! test -s /var/lib/arvados/superuser_token ; then
fi
if ! test -s /var/lib/arvados/superuser_token ; then
- bundle exec ./script/create_superuser_token.rb > /var/lib/arvados/superuser_token
+ superuser_tok=$(bundle exec ./script/create_superuser_token.rb)
+ echo "$superuser_tok" > /var/lib/arvados/superuser_token
fi
rm -rf tmp
fi
rm -rf tmp