projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16267: switch to `arvados-server install -type test` for installing
[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 bf802d45f3d8bdb9f13868bb39f66136ab34f42c..cf5ccd724b885ee84233b03e0259ef9c5906e8cc 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
@@
-10,7
+10,7
@@
set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
. /usr/local/lib/arvbox/go-setup.sh
. /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/keepproxy"
+flock /var/lib/gopath/gopath.lock go
install "git.arvados.org
/arvados.git/services/keepproxy"
install $GOPATH/bin/keepproxy /usr/local/bin
if test "$1" = "--only-deps" ; then
install $GOPATH/bin/keepproxy /usr/local/bin
if test "$1" = "--only-deps" ; then
@@
-19,25
+19,25
@@
fi
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
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_TOKEN=$(cat
$ARVADOS_CONTAINER_PATH
/superuser_token)
set +e
read -rd $'\000' keepservice <<EOF
{
"service_host":"$localip",
set +e
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
set -e
"service_type":"proxy"
}
EOF
set -e
-if test -s
/var/lib/arvados
/keepproxy-uuid ; then
- keep_uuid=$(cat
/var/lib/arvados
/keepproxy-uuid)
+if test -s
$ARVADOS_CONTAINER_PATH
/keepproxy-uuid ; then
+ keep_uuid=$(cat
$ARVADOS_CONTAINER_PATH
/keepproxy-uuid)
arv keep_service update --uuid $keep_uuid --keep-service "$keepservice"
else
UUID=$(arv --format=uuid keep_service create --keep-service "$keepservice")
arv keep_service update --uuid $keep_uuid --keep-service "$keepservice"
else
UUID=$(arv --format=uuid keep_service create --keep-service "$keepservice")
- echo $UUID >
/var/lib/arvados
/keepproxy-uuid
+ echo $UUID >
$ARVADOS_CONTAINER_PATH
/keepproxy-uuid
fi
fi
-exec /usr/local/bin/keepproxy
-listen=:${services[keepproxy]}
+exec /usr/local/bin/keepproxy