浏览代码

Merge pull request #5176 from unclejack/check_before_pulling

cli integ: don't fetch busybox if it exists
Tianon Gravi 11 年之前
父节点
当前提交
2d20c92d29
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      hack/make/test-integration-cli

+ 4 - 1
hack/make/test-integration-cli

@@ -29,8 +29,11 @@ bundle_test_integration_cli() {
 	
 	
 	# pull the busybox image before running the tests
 	# pull the busybox image before running the tests
 	sleep 2
 	sleep 2
-	( set -x; docker pull busybox )
 	
 	
+	if ! docker inspect busybox &> /dev/null; then
+		( set -x; docker pull busybox )
+	fi
+
 	bundle_test_integration_cli
 	bundle_test_integration_cli
 	
 	
 	DOCKERD_PID=$(set -x; cat $DEST/docker.pid)
 	DOCKERD_PID=$(set -x; cat $DEST/docker.pid)