[ARVADOS] updated: 1.3.0-146-gb2b98cbc9

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox                        | 5 +++--
 tools/arvbox/lib/arvbox/docker/service/ssh/run | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  b2b98cbc9c213d2831405b6eb37e0f52fa2e9e17 (commit)
      from  36c705beb497a5ef8348e5f977ee6ad6674c7d11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b2b98cbc9c213d2831405b6eb37e0f52fa2e9e17
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jan 9 14:39:43 2019 -0500

    arvbox uses 'down: ready' as ready condition no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index ada53a200..a258b8e23 100755
--- 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 74946f074..b1aedaaf3 100755
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--