Browse Source

Merge pull request #1815 from aanand/abort-if-daemon-cant-start

Abort tests if daemon fails to start
Aanand Prasad 10 years ago
parent
commit
f7b9daf927
1 changed files with 7 additions and 0 deletions
  1. 7 0
      script/wrapdocker

+ 7 - 0
script/wrapdocker

@@ -8,9 +8,16 @@ fi
 # delete it so that docker can start.
 # delete it so that docker can start.
 rm -rf /var/run/docker.pid
 rm -rf /var/run/docker.pid
 docker -d $DOCKER_DAEMON_ARGS &>/var/log/docker.log &
 docker -d $DOCKER_DAEMON_ARGS &>/var/log/docker.log &
+docker_pid=$!
 
 
 >&2 echo "Waiting for Docker to start..."
 >&2 echo "Waiting for Docker to start..."
 while ! docker ps &>/dev/null; do
 while ! docker ps &>/dev/null; do
+    if ! kill -0 "$docker_pid" &>/dev/null; then
+        >&2 echo "Docker failed to start"
+        cat /var/log/docker.log
+        exit 1
+    fi
+
     sleep 1
     sleep 1
 done
 done