From 24aaaa029e4c5ed7316fdab52ecffe3e4f6f8aaf Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Sun, 3 May 2015 19:20:47 -0700 Subject: [PATCH] integration: Use the brand new dind image. We now have dockerswarm/dind: - Much more lightweight. - Exists in every version since Docker 1.0.0. Depends on #700 as it cannot run on aufs. Signed-off-by: Andrea Luzzardi --- test/integration/helpers.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index c2ba3dd5b1..878d1ff46e 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -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 ))