X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/379717415ec5f772ab2f54e263c2c3f44d77f70f..72cb9197fe4d7a1cc8b822e724d3fc03d77541dd:/docker/arvdock

diff --git a/docker/arvdock b/docker/arvdock
index 4b7509e667..a41056cd68 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -6,6 +6,8 @@ if [[ "$DOCKER" == "" ]]; then
     DOCKER=`which docker`
 fi
 
+CURL=`which curl`
+
 COMPUTE_COUNTER=0
 
 function usage {
@@ -93,23 +95,6 @@ function start_container {
       echo "Started container: $container"
     fi
 
-    if [[ "$name" == "doc_server" ]]; then
-      echo
-      echo "******************************************************************"
-      echo "You can access the Arvados documentation at http://doc.dev.arvados"
-      echo "******************************************************************"
-      echo
-    fi
-
-    if [[ "$name" == "workbench_server" ]]; then
-      echo
-      echo "********************************************************************"
-      echo "You can access the Arvados workbench at http://workbench.dev.arvados"
-      echo "********************************************************************"
-      echo
-   fi
-
-
 }
 
 # Create a Docker data volume
@@ -317,16 +302,41 @@ EOF
         fi
     fi
 
-    `cat /etc/resolv.conf |grep -P "nameserver 172\.17\.42\.1" -q`
-    if [[ "$?" == "1" ]]; then
+    if [ "$(awk '($1 == "nameserver"){print $2; exit}' </etc/resolv.conf)" != "172.17.42.1" ]; then
         echo
         echo "******************************************************************"
         echo "To access Arvados you must add the Arvados nameserver to the top"
         echo "of your DNS configuration in /etc/resolv.conf:"
         echo "nameserver 172.17.42.1"
+        echo
+        echo "Then run '$0 start' again"
         echo "******************************************************************"
         echo
+    else
+        while ! $CURL -L -f http://workbench.dev.arvados >/dev/null 2>/dev/null ; do
+            echo "Waiting for Arvados to be ready."
+            sleep 1
+        done
+
+        `$DOCKER ps |grep -P "doc_server[^/]" -q`
+        if [[ "$?" == "0" ]]; then
+            echo
+            echo "******************************************************************"
+            echo "You can access the Arvados documentation at http://doc.dev.arvados"
+            echo "******************************************************************"
+            echo
+        fi
+
+        `$DOCKER ps |grep -P "workbench_server[^/]" -q`
+        if [[ "$?" == "0" ]]; then
+            echo
+            echo "********************************************************************"
+            echo "You can access the Arvados workbench at http://workbench.dev.arvados"
+            echo "********************************************************************"
+            echo
+        fi
     fi
+
 }
 
 function do_stop {
@@ -455,6 +465,18 @@ function do_reset {
     done
 }
 
+if [ "$DOCKER" == '' ]
+then
+  echo "Docker not found. Please install it first."
+  exit 2
+fi
+
+if [ "$CURL" == '' ]
+then
+  echo "Curl not found. Please install it first."
+  exit 3
+fi
+
 if [ $# -lt 1 ]
 then
   usage