Fix build timeout on CircleCI (#352)

David Chung · web-flow · commit a144077b6867 · 2017-01-05T16:50:14.000-08:00
Signed-off-by: David Chung &lt;david.chung@docker.com&gt;
diff --git a/scripts/container-test b/scripts/container-test
@@ -17,8 +17,8 @@ cleanup() {
     echo "cleaning up docker images"
     docker ps | grep devbundle | awk '{print $1}' | xargs docker stop
     docker ps | grep devbundle | awk '{print $1}' | xargs docker rm
+    rm -rf $TEST_DIR
   fi
-  rm -rf $TEST_DIR
 }
 trap cleanup EXIT
 

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ cleanup() {`
`17`	`17`	`echo "cleaning up docker images"`
`18`	`18`	`docker ps \| grep devbundle \| awk '{print $1}' \| xargs docker stop`
`19`	`19`	`docker ps \| grep devbundle \| awk '{print $1}' \| xargs docker rm`
	`20`	`+ rm -rf $TEST_DIR`
`20`	`21`	`fi`
`21`		`- rm -rf $TEST_DIR`
`22`	`22`	`}`
`23`	`23`	`trap cleanup EXIT`
`24`	`24`