Merge remote-tracking branch 'upstream/master'

weave

@@ -813,10 +813,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
 }
@@ -948,7 +948,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