arvbox uses 'down: ready' as ready condition no issue #

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 ada53a200984320d1fc89ff32952324dc68ea000..a258b8e2329eeb2aa1c6b6707678e89d750849df 100755 (executable)
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -103,9 +103,10 @@ wait_for_arvbox() {
     docker logs -f $ARVBOX_CONTAINER > $FF &
     LOGPID=$!
     while read line ; do
-        echo $line
-        if echo $line | grep "Workbench2 is running at" >/dev/null ; then
+        if echo $line | grep "ok: down: ready:" >/dev/null ; then
             kill $LOGPID
+       else
+           echo $line
         fi
     done < $FF
     rm $FF

diff --git a/tools/arvbox/lib/arvbox/docker/service/ssh/run b/tools/arvbox/lib/arvbox/docker/service/ssh/run
index 74946f074728e4eb844f093824fed46fd54032a3..b1aedaaf3880273e16f107abfa9338ac183be25e 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/ssh/run
+++ b/tools/arvbox/lib/arvbox/docker/service/ssh/run
@@ -10,4 +10,4 @@ if ! test -d /var/run/sshd ; then
    mkdir /var/run/sshd
    chmod 0755 /var/run/sshd
 fi
-/usr/sbin/sshd -D
+exec /usr/sbin/sshd -D