projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14715-keepprox-config
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
service
/
keepproxy
/
run-service
diff --git
a/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
b/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
index 00b2e01f8305a4d21c17a48cfe79ba7fa31049c8..96457a6e5931a6dffa0378a09333b2c4edd53698 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
@@
-1,25
+1,23
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
exec 2>&1
sleep 2
set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
exec 2>&1
sleep 2
set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
+. /usr/local/lib/arvbox/go-setup.sh
-mkdir -p /var/lib/gopath
-cd /var/lib/gopath
-
-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/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/keepproxy"
flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/keepproxy"
-install bin/keepproxy /usr/local/bin
+install
$GOPATH/
bin/keepproxy /usr/local/bin
if test "$1" = "--only-deps" ; then
exit
fi
if test "$1" = "--only-deps" ; then
exit
fi
-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)
export ARVADOS_API_HOST_INSECURE=1
export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
@@
-27,8
+25,8
@@
set +e
read -rd $'\000' keepservice <<EOF
{
"service_host":"$localip",
read -rd $'\000' keepservice <<EOF
{
"service_host":"$localip",
- "service_port":${services[keepproxy]},
- "service_ssl_flag":
fals
e,
+ "service_port":${services[keepproxy
-ssl
]},
+ "service_ssl_flag":
tru
e,
"service_type":"proxy"
}
EOF
"service_type":"proxy"
}
EOF
@@
-42,4
+40,4
@@
else
echo $UUID > /var/lib/arvados/keepproxy-uuid
fi
echo $UUID > /var/lib/arvados/keepproxy-uuid
fi
-exec /usr/local/bin/keepproxy
-listen=:${services[keepproxy]}
+exec /usr/local/bin/keepproxy