docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #703 from aluzzardi/integration-image 

integration: Use the brand new dind image.
This commit is contained in:
Andrea Luzzardi 2015-05-04 13:43:38 -07:00
parent b27e9896bc 24aaaa029e
commit 3cc8a2b5fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/helpers.bash
View File

@ -7,8 +7,8 @@ SWARM_ROOT=${SWARM_ROOT:-${BATS_TEST_DIRNAME}/../..}
SWARM_BINARY=`mktemp`
# Docker image and version to use for integration tests.
DOCKER_IMAGE=${DOCKER_IMAGE:-dockerswarm/docker}
DOCKER_VERSION=${DOCKER_VERSION:-1.6}
DOCKER_IMAGE=${DOCKER_IMAGE:-dockerswarm/dind}
DOCKER_VERSION=${DOCKER_VERSION:-1.6.0}
# Host on which the manager will listen to (random port between 6000 and 7000).
SWARM_HOST=127.0.0.1:$(( ( RANDOM % 1000 ) + 6000 ))