14660: make "sv restart" work for workbench2, prevent fail loop

Print out https url for workbench2 on start.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index e2f58cf139f235b92277612982926dd8b2b768c6..ada53a200984320d1fc89ff32952324dc68ea000 100755 (executable)
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -104,7 +104,7 @@ wait_for_arvbox() {
     LOGPID=$!
     while read line ; do
         echo $line
-        if echo $line | grep "Workbench is running at" >/dev/null ; then
+        if echo $line | grep "Workbench2 is running at" >/dev/null ; then
             kill $LOGPID
         fi
     done < $FF

diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run b/tools/arvbox/lib/arvbox/docker/service/composer/run
index cd2f86a27e8f96c8a8a37d1a7726a6d88c79dbf6..50a8ce1204bc9c9dacbe76055112fa871716987c 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/composer/run
+++ b/tools/arvbox/lib/arvbox/docker/service/composer/run
@@ -5,4 +5,4 @@
 
 set -e
 
-/usr/local/lib/arvbox/runsu.sh $0-service $1
+exec /usr/local/lib/arvbox/runsu.sh $0-service $1

diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
index 4e1371eb67f21696884421019730153082a48221..470d10537556ab797b95edb1042b06411703f820 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
@@ -91,5 +91,6 @@ fi
 echo
 echo "Your Arvados-in-a-box is ready!"
 echo "Workbench is running at https://$localip"
+echo "Workbench2 is running at https://$localip:${services[workbench2-ssl]}"
 
 rm -r /tmp/arvbox-ready

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench2/run b/tools/arvbox/lib/arvbox/docker/service/workbench2/run
index cd2f86a27e8f96c8a8a37d1a7726a6d88c79dbf6..50a8ce1204bc9c9dacbe76055112fa871716987c 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench2/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench2/run
@@ -5,4 +5,4 @@
 
 set -e
 
-/usr/local/lib/arvbox/runsu.sh $0-service $1
+exec /usr/local/lib/arvbox/runsu.sh $0-service $1

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
index 1aef132799759e7a615d636d6e3d5d2cb78391bf..2dbef4ab876ab1911c518eded2b17478cd8acca4 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
@@ -18,6 +18,16 @@ if test "$1" = "--only-deps" ; then
     exit
 fi
 
-echo "{\"API_HOST\": \"${localip}:${services[controller-ssl]}\"}" > /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"
+}
+EOF
+
 export HTTPS=false
-exec yarn start
+# 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.
+exec node node_modules/react-scripts-ts/scripts/start.js