From f7739ef04cf3bc701f7790b4db841805b45124d1 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom@weave.works>
Date: Tue, 14 Jul 2015 14:50:39 +0000
Subject: [PATCH] Don't fail if docker rmi fails

---
 test/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/setup.sh b/test/setup.sh
index 71df8c29..0410af57 100755
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -13,7 +13,7 @@ echo "  prefetch test images"
 for HOST in $HOSTS; do
     docker_on $HOST load -i ../weave.tar
     DANGLING_IMAGES="$(docker_on $HOST images -q -f dangling=true)"
-    [ -n "$DANGLING_IMAGES" ] && docker_on $HOST rmi $DANGLING_IMAGES
+    [ -n "$DANGLING_IMAGES" ] && docker_on $HOST rmi $DANGLING_IMAGES 1>/dev/null 2>&1 || true
     run_on $HOST mkdir -p bin
     upload_executable $HOST ../bin/docker-ns
     upload_executable $HOST ../weave