15924: Change import paths to git.arvados.org.

[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 b66463f1c3e363c1f96913928ca00d851885e07a..3bc3899b0b8e7c070f6d71f23dd604ade36950ef 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -1,30 +1,32 @@
 #!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 exec 2>&1
 sleep 2
 set -eux -o pipefail
 
 . /usr/local/lib/arvbox/common.sh
+. /usr/local/lib/arvbox/go-setup.sh
 
-mkdir -p /var/lib/arvados/gostuff
-cd /var/lib/arvados/gostuff
+flock /var/lib/gopath/gopath.lock go install "git.arvados.org/arvados.git/services/keepstore"
+install $GOPATH/bin/keepstore /usr/local/bin
 
-export GOPATH=$PWD
-mkdir -p "$GOPATH/src/git.curoverse.com"
-ln -sfn "/usr/src/arvados" "$GOPATH/src/git.curoverse.com/arvados.git"
-flock /var/lib/arvados/gostuff.lock go get -t "git.curoverse.com/arvados.git/services/keepstore"
-install bin/keepstore /usr/local/bin
+if test "$1" = "--only-deps" ; then
+    exit
+fi
 
 mkdir -p /var/lib/arvados/$1
 
-export ARVADOS_API_HOST=$localip:${services[api]}
+export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
 export ARVADOS_API_HOST_INSECURE=1
 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"
@@ -40,12 +42,17 @@ 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 \
-     -max-buffers=20 \
-     -volume=/var/lib/arvados/$1
+sv hup /var/lib/arvbox/service/keepproxy
+
+cat >/var/lib/arvados/$1.yml <<EOF
+Listen: "localhost:$2"
+BlobSigningKeyFile: /var/lib/arvados/blob_signing_key
+SystemAuthTokenFile: /var/lib/arvados/superuser_token
+ManagementToken: $management_token
+MaxBuffers: 20
+EOF
+
+exec /usr/local/bin/keepstore -config=/var/lib/arvados/$1.yml