From 59ae50eb4ef9cca4a7154a823df5302a7d80e924 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 11 Apr 2015 12:24:09 +0100 Subject: [PATCH] don't rely on `docker inspect` for determining container death Docker can take a while to notice & record the death of containers, so we perform a more direct check instead. Fixes #522. --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index 3bb5003e..ea4119ce 100755 --- a/weave +++ b/weave @@ -284,7 +284,7 @@ with_container_netns () { shift 1 if ! "$@" >$IP_TMPOUT 2>$IP_TMPERR ; then STATUS=1 - if [ "$(docker inspect --format='{{.State.Pid}}' $CONTAINER)" != "$CONTAINER_PID" ] ; then + if ! kill -0 "$CONTAINER_PID" 2>/dev/null ; then echo "Container $CONTAINER died" >&2 else echo "Failure during network configuration for container $CONTAINER:" >&2