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

Merge pull request #2126 from vieux/update_compose 

update compose, remove useless bash and improve tests
This commit is contained in:
Alexandre Beslic 2016-04-21 16:51:37 -07:00
parent d9beef7635 ddd4aa2bf2
commit cf9806004f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/api/top.bats
View File

@ -18,7 +18,7 @@ function teardown() {
run docker_swarm top test_container run docker_swarm top test_container
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${lines[0]}" == *"UID"* ]] [[ "${lines[0]}" == *"UID"* ]] || [[ "${lines[0]}" == *"PID"* ]]
[[ "${lines[0]}" == *"CMD"* ]] [[ "${lines[0]}" == *"CMD"* ]] || [[ "${lines[0]}" == *"COMMAND"* ]]
[[ "${lines[1]}" == *"sleep 500"* ]] [[ "${lines[1]}" == *"sleep 500"* ]]
} }

4
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.6.2} DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-1.7.0}
# 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 ))
@ -205,7 +205,7 @@ function start_docker() {
# -v /usr/local/bin -v /var/run are specific to mesos, so the slave can do a --volumes-from and use the docker cli # -v /usr/local/bin -v /var/run are specific to mesos, so the slave can do a --volumes-from and use the docker cli
docker_host run -d --name node-$i --privileged -v /usr/local/bin -v /var/run -it --net=host \ docker_host run -d --name node-$i --privileged -v /usr/local/bin -v /var/run -it --net=host \
${DOCKER_IMAGE}:${DOCKER_VERSION} \ ${DOCKER_IMAGE}:${DOCKER_VERSION} \
bash -c "\ sh -c "\
rm /var/run/docker.pid ; \ rm /var/run/docker.pid ; \
rm /var/run/docker/libcontainerd/docker-containerd.pid ; \ rm /var/run/docker/libcontainerd/docker-containerd.pid ; \
rm /var/run/docker/libcontainerd/docker-containerd.sock ; \ rm /var/run/docker/libcontainerd/docker-containerd.sock ; \