19077: yarn is already installed

[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 8c3c49efd65dced676317333f0fa755280d9bde2..2b68cadafde7514383cf7e0b3a5d09b0a9a638c3 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
@@ -8,9 +8,13 @@ set -ex -o pipefail
 
 .  /usr/local/lib/arvbox/common.sh
 
-cd /usr/src/workbench2
+if test "$1" != "--only-deps" ; then
+  while [ ! -f $ARVADOS_CONTAINER_PATH/api.ready ]; do
+    sleep 1
+  done
+fi
 
-npm -d install --prefix /usr/local --global yarn@1.17.3
+cd /usr/src/workbench2
 
 yarn install
 
@@ -47,9 +51,12 @@ else
     arv api_client create --api-client "$apiclient"
 fi
 
-export HTTPS=false
 # Can't use "yarn start", need to run the dev server script
 # directly so that the TERM signal from "sv restart" gets to the
 # right process.
 export VERSION=$(./version-at-commit.sh)
-exec node node_modules/react-scripts-ts/scripts/start.js
+export BROWSER=none
+export CI=true
+export HTTPS=false
+node --version
+exec node node_modules/react-scripts/scripts/start.js