0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5176 from unclejack/check_before_pulling

Browse source 
cli integ: don't fetch busybox if it exists
This commit is contained in:
Tianon Gravi 2014-04-13 09:28:30 -06:00
commit 2d20c92d29
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hack/make/test-integration-cli
View file

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