Fix broken build due to CircleCI's outdated Docker version (#349)

David Chung · web-flow · commit f25fe86bcc73 · 2017-01-05T16:11:07.000-08:00
Signed-off-by: David Chung &lt;david.chung@docker.com&gt;
diff --git a/scripts/container-test b/scripts/container-test
@@ -13,6 +13,7 @@ DOCKER_TAG="${DOCKER_TAG:-dev}"
 
 cleanup() {
   docker ps | grep devbundle | awk '{print $1}' | xargs docker stop
+  docker ps | grep devbundle | awk '{print $1}' | xargs docker rm
   rm -rf $TEST_DIR
 }
 trap cleanup EXIT
@@ -27,7 +28,7 @@ volumes="-v $TEST_DIR:/root -v $PWD/docs:/root/docs"
 envs="-e INFRAKIT_PLUGINS_DIR=/root"
 
 server() {
- docker run -d --rm --name $1 $envs $volumes $DOCKER_IMAGE:$DOCKER_TAG $@
+ docker run -d --name $1 $envs $volumes $DOCKER_IMAGE:$DOCKER_TAG $@
 }
 
 run() {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ DOCKER_TAG="${DOCKER_TAG:-dev}"`
`13`	`13`
`14`	`14`	`cleanup() {`
`15`	`15`	`docker ps \| grep devbundle \| awk '{print $1}' \| xargs docker stop`
	`16`	`+ docker ps \| grep devbundle \| awk '{print $1}' \| xargs docker rm`
`16`	`17`	`rm -rf $TEST_DIR`
`17`	`18`	`}`
`18`	`19`	`trap cleanup EXIT`
`@@ -27,7 +28,7 @@ volumes="-v $TEST_DIR:/root -v $PWD/docs:/root/docs"`
`27`	`28`	`envs="-e INFRAKIT_PLUGINS_DIR=/root"`
`28`	`29`
`29`	`30`	`server() {`
`30`		`- docker run -d --rm --name $1 $envs $volumes $DOCKER_IMAGE:$DOCKER_TAG $@`
	`31`	`+ docker run -d --name $1 $envs $volumes $DOCKER_IMAGE:$DOCKER_TAG $@`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`run() {`