Merge branch '16265-security-updates' into dependabot/bundler/apps/workbench/loofah...

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

diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
index f16cb44b7f56de46ab0e4be35ade64a4f3693ff1..3bc3899b0b8e7c070f6d71f23dd604ade36950ef 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -10,7 +10,7 @@ set -eux -o pipefail
 . /usr/local/lib/arvbox/common.sh
 . /usr/local/lib/arvbox/go-setup.sh
 
-flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/keepstore"
+flock /var/lib/gopath/gopath.lock go install "git.arvados.org/arvados.git/services/keepstore"
 install $GOPATH/bin/keepstore /usr/local/bin
 
 if test "$1" = "--only-deps" ; then
@@ -26,7 +26,7 @@ export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
 set +e
 read -rd $'\000' keepservice <<EOF
 {
- "service_host":"$localip",
+ "service_host":"localhost",
  "service_port":$2,
  "service_ssl_flag":false,
  "service_type":"disk"
@@ -45,17 +45,14 @@ fi
 management_token=$(cat /var/lib/arvados/management_token)
 
 set +e
-killall -HUP keepproxy
+sv hup /var/lib/arvbox/service/keepproxy
 
 cat >/var/lib/arvados/$1.yml <<EOF
-Listen: ":$2"
+Listen: "localhost:$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