arvbox uses keep config file instead of cli switches. no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index 749df4ad0b86dca10c86e51915fdce7c85122dc4..6dd6a65695559a1e0024a0d2af4693632bf6da2e 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -33,6 +33,11 @@ if ! test -s /var/lib/arvados/blob_signing_key ; then
 fi
 blob_signing_key=$(cat /var/lib/arvados/blob_signing_key)
 
+if ! test -s /var/lib/arvados/management_token ; then
+    ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/management_token
+fi
+management_token=$(cat /var/lib/arvados/management_token)
+
 # self signed key will be created by SSO server script.
 test -s /var/lib/arvados/self-signed.key
 
@@ -66,6 +71,7 @@ $RAILS_ENV:
   default_collection_replication: 1
   docker_image_formats: ["v2"]
   keep_web_service_url: http://$localip:${services[keep-web]}/
+  ManagementToken: $management_token
 EOF
 
 (cd config && /usr/local/lib/arvbox/yml_override.py application.yml)

diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
index ec63027ef43b85df708fc22b7a50cd94c40de95c..f16cb44b7f56de46ab0e4be35ade64a4f3693ff1 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -42,13 +42,20 @@ else
     echo $UUID > /var/lib/arvados/$1-uuid
 fi
 
+management_token=$(cat /var/lib/arvados/management_token)
+
 set +e
 killall -HUP keepproxy
 
-exec /usr/local/bin/keepstore \
-     -listen=:$2 \
-     -enforce-permissions=true \
-     -blob-signing-key-file=/var/lib/arvados/blob_signing_key \
-     -data-manager-token-file=/var/lib/arvados/superuser_token \
-     -max-buffers=20 \
-     -volume=/var/lib/arvados/$1
+cat >/var/lib/arvados/$1.yml <<EOF
+Listen: ":$2"
+BlobSigningKeyFile: /var/lib/arvados/blob_signing_key
+SystemAuthTokenFile: /var/lib/arvados/superuser_token
+ManagementToken: $management_token
+MaxBuffers: 20
+Volumes:
+  - Type: Directory
+    Root: /var/lib/arvados/$1
+EOF
+
+exec /usr/local/bin/keepstore -config=/var/lib/arvados/$1.yml