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

Merge pull request #1513 from vieux/compose_1.5.2 

update compose to 1.5.2
This commit is contained in:
Alexandre Beslic 2015-12-08 12:43:37 -08:00
parent 4aafe4aa7b b399d7c7ed
commit 31791e2241
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/helpers.bash
View File

@ -16,7 +16,7 @@ SWARM_BINARY=${SWARM_BINARY:-${SWARM_ROOT}/swarm}
DOCKER_IMAGE=${DOCKER_IMAGE:-dockerswarm/dind-master} DOCKER_IMAGE=${DOCKER_IMAGE:-dockerswarm/dind-master}
DOCKER_VERSION=${DOCKER_VERSION:-latest} DOCKER_VERSION=${DOCKER_VERSION:-latest}
DOCKER_BINARY=${DOCKER_BINARY:-`command -v docker`} DOCKER_BINARY=${DOCKER_BINARY:-`command -v docker`}
DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-1.5.1} DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-1.5.2}
# Port on which the manager will listen to (random port between 6000 and 7000). # Port on which the manager will listen to (random port between 6000 and 7000).
SWARM_BASE_PORT=$(( ( RANDOM % 1000 ) + 6000 )) SWARM_BASE_PORT=$(( ( RANDOM % 1000 ) + 6000 ))