projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arvbox option to override API_HOST to test with other clusters
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
service
/
workbench2
/
run-service
diff --git
a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
index a112cb93fe07cadbcfb814606497df0b0e9328f8..5268c7e17e198866f29e1bf70afdca33131ea129 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
@@
-16,19
+16,21
@@
fi
cd /usr/src/workbench2
cd /usr/src/workbench2
-npm -d install --prefix /usr/local --global yarn@1.17.3
-
yarn install
if test "$1" = "--only-deps" ; then
exit
fi
yarn install
if test "$1" = "--only-deps" ; then
exit
fi
+API_HOST=${localip}:${services[controller-ssl]}
+
+if test -f /usr/src/workbench2/public/API_HOST ; then
+ API_HOST=$(cat /usr/src/workbench2/public/API_HOST)
+fi
+
cat <<EOF > /usr/src/workbench2/public/config.json
{
cat <<EOF > /usr/src/workbench2/public/config.json
{
- "API_HOST": "${localip}:${services[controller-ssl]}",
- "VOCABULARY_URL": "/vocabulary-example.json",
- "FILE_VIEWERS_CONFIG_URL": "/file-viewers-example.json"
+ "API_HOST": "$API_HOST"
}
EOF
}
EOF