From fe236e95db70a8b40a3f218a4b397c87e7bcc562 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 17 Oct 2014 12:38:37 +0100
Subject: [PATCH] Work round change in Docker 1.3 where 'Pulling' messages are
 included in 'docker run' output

---
 weaver/weave | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weaver/weave b/weaver/weave
index 53ac8487..e4c0240d 100755
--- a/weaver/weave
+++ b/weaver/weave
@@ -259,7 +259,7 @@ case "$COMMAND" in
         # Set WEAVE_DOCKER_ARGS in the environment in order to supply
         # additional parameters, such as resource limits, to docker
         # when launching the weave container.
-        CONTAINER=$(docker run --privileged -d --name=weave -p 6783:6783/tcp -p 6783:6783/udp $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR "$@")
+        CONTAINER=$(docker run --privileged -d --name=weave -p 6783:6783/tcp -p 6783:6783/udp $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR "$@" | tail -n 1)
         with_container_netns attach $CONTAINER $IPADDR eth0
         echo $CONTAINER
         ;;
@@ -296,7 +296,7 @@ case "$COMMAND" in
         IPADDR=$1
         shift 1
         create_bridge
-        CONTAINER=$(docker run -d "$@")
+        CONTAINER=$(docker run -d "$@" | tail -n 1)
         with_container_netns attach $CONTAINER $IPADDR $CONTAINER_IFNAME
         echo $CONTAINER
         ;;