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

Merge pull request #519 from chanwit/set-swarm-root 

Cleanup: make SWARM_ROOT configurable
This commit is contained in:
Andrea Luzzardi 2015-03-27 17:36:50 +01:00
parent c28b3a736c 458d83802f
commit 21404e01f4
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

@ -1,7 +1,7 @@
#!/bin/bash
# Root directory of the repository.
SWARM_ROOT=${BATS_TEST_DIRNAME}/../..
SWARM_ROOT=${SWARM_ROOT:-${BATS_TEST_DIRNAME}/../..}
# Docker image and version to use for integration tests.
DOCKER_IMAGE=${DOCKER_IMAGE:-aluzzardi/docker}
@ -33,7 +33,7 @@ function wait_until_reachable() {
echo "Attempt to connect to ${HOSTS[$i]} failed for the $((++attempts)) time" >&2
sleep 0.5
done
[[ $attempts -lt $max_attempts ]]
[[ $attempts -lt $max_attempts ]]
}
# Start the swarm manager in background.