simplify docker image removal

This commit is contained in:
Matthias Radestock committed 2015-06-23 14:39:29 +01:00
1 parent 369bd0f4dc
commit ae8172ec97
1 file changed
+1 -3
+1 -3
View File
@@ -10,9 +10,7 @@ start_suite "Proxy waits for weave to be ready before running container commands
weave_on $HOST1 launch-proxy
BASE_IMAGE=busybox
# Ensure the base image does not exist, so that it will be pulled
if (docker_on $HOST1 images $BASE_IMAGE | grep -q $BASE_IMAGE); then
docker_on $HOST1 rmi $BASE_IMAGE
fi
! docker_on $HOST1 inspect --format=" " $BASE_IMAGE >/dev/null 2>&1 || docker_on $HOST1 rmi $BASE_IMAGE
assert_raises "proxy docker_on $HOST1 run --name c1 -e 'WEAVE_CIDR=10.2.1.1/24' $BASE_IMAGE $CHECK_ETHWE_UP"