projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18947-keep-web'
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
service
/
composer
/
run-service
diff --git
a/tools/arvbox/lib/arvbox/docker/service/composer/run-service
b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
index ac4441de099ab37e1a0a36109807cf9e127db507..4235bcd0c864761701d0f98febf9f80def47aabf 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/composer/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/composer/run-service
@@
-10,13
+10,15
@@
set -ex -o pipefail
cd /usr/src/composer
cd /usr/src/composer
-npm -d install yarn
-
-PATH=$PATH:/usr/src/composer/node_modules/.bin
+npm -d install --prefix /usr/local --global yarn@1.17.3
yarn install
yarn install
-if test "$1" != "--only-deps" ; then
- echo "apiEndPoint: https://${localip}:${services[api]}" > /usr/src/composer/src/composer.yml
- exec ng serve --host 0.0.0.0 --port 4200 --env=webdev
+if test "$1" = "--only-deps" ; then
+ exit
fi
fi
+
+cat >/usr/src/composer/src/composer.yml <<EOF
+API_HOST: ${localip}:${services[controller-ssl]}
+EOF
+exec node_modules/.bin/ng serve --host 0.0.0.0 --port 4200 --env=webdev --ssl=true --sslCert="${server_cert}" --sslKey="${server_cert_key}"