From b9502ee1cdcd08bc8e908e036960228c8144469e Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 29 Jan 2016 14:43:02 +0000
Subject: [PATCH 1/2] Check if container is running before using its image to
 ask for version

---
 weave | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/weave b/weave
index 74c0bd87..2dc68205 100755
--- a/weave
+++ b/weave
@@ -812,10 +812,10 @@ router_opts_bridged_fastdp() {
 }
 
 ask_version() {
-    if ! DOCKERIMAGE=$(docker inspect --format='{{.Image}}' $1 2>/dev/null) ; then
-            if ! DOCKERIMAGE=$(docker inspect --format='{{.Id}}' $2 2>/dev/null) ; then
-                echo "Unable to find $2 image." >&2
-            fi
+    if check_running $1 2>/dev/null ; then
+        DOCKERIMAGE=$(docker inspect --format='{{.Image}}' $1 )
+    elif ! DOCKERIMAGE=$(docker inspect --format='{{.Id}}' $2 2>/dev/null) ; then
+        echo "Unable to find $2 image." >&2
     fi
     [ -n "$DOCKERIMAGE" ] && docker run --rm --net=none -e WEAVE_CIDR=none $3 $DOCKERIMAGE $COVERAGE_ARGS --version
 }

From 3c6211f9f289657476ce967b6e82bba6ce8557c4 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 29 Jan 2016 15:07:14 +0000
Subject: [PATCH 2/2] Don't rm old containers, in case we want the log

---
 weave | 1 -
 1 file changed, 1 deletion(-)

diff --git a/weave b/weave
index 74c0bd87..c40287e9 100755
--- a/weave
+++ b/weave
@@ -947,7 +947,6 @@ check_not_running() {
 
 stop() {
     docker stop $1 >/dev/null 2>&1 || echo "$2 is not running." >&2
-    docker rm -f $1 >/dev/null 2>&1 || true
 }
 
 # Given a container name or short ID in $1, ensure the specified