mirror of
https://github.com/docker/compose.git
synced 2025-07-27 07:34:10 +02:00
Test against a dev build of Engine 1.10
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
parent
406b6b28f4
commit
ab2d18851f
@ -18,8 +18,7 @@ get_versions="docker run --rm
|
|||||||
if [ "$DOCKER_VERSIONS" == "" ]; then
|
if [ "$DOCKER_VERSIONS" == "" ]; then
|
||||||
DOCKER_VERSIONS="$($get_versions default)"
|
DOCKER_VERSIONS="$($get_versions default)"
|
||||||
elif [ "$DOCKER_VERSIONS" == "all" ]; then
|
elif [ "$DOCKER_VERSIONS" == "all" ]; then
|
||||||
# TODO: `-n 2` when engine 1.10 releases
|
DOCKER_VERSIONS="1.9.1 1.10.0-dev"
|
||||||
DOCKER_VERSIONS="$($get_versions recent -n 1)"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -39,12 +38,18 @@ for version in $DOCKER_VERSIONS; do
|
|||||||
|
|
||||||
trap "on_exit" EXIT
|
trap "on_exit" EXIT
|
||||||
|
|
||||||
|
if [[ $version == *"-dev" ]]; then
|
||||||
|
repo="dnephin/dind"
|
||||||
|
else
|
||||||
|
repo="dockerswarm/dind"
|
||||||
|
fi
|
||||||
|
|
||||||
docker run \
|
docker run \
|
||||||
-d \
|
-d \
|
||||||
--name "$daemon_container" \
|
--name "$daemon_container" \
|
||||||
--privileged \
|
--privileged \
|
||||||
--volume="/var/lib/docker" \
|
--volume="/var/lib/docker" \
|
||||||
dockerswarm/dind:$version \
|
"$repo:$version" \
|
||||||
docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
|
docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
|
||||||
2>&1 | tail -n 10
|
2>&1 | tail -n 10
|
||||||
|
|
||||||
@ -52,6 +57,7 @@ for version in $DOCKER_VERSIONS; do
|
|||||||
--rm \
|
--rm \
|
||||||
--link="$daemon_container:docker" \
|
--link="$daemon_container:docker" \
|
||||||
--env="DOCKER_HOST=tcp://docker:2375" \
|
--env="DOCKER_HOST=tcp://docker:2375" \
|
||||||
|
--env="DOCKER_VERSION=$version" \
|
||||||
--entrypoint="tox" \
|
--entrypoint="tox" \
|
||||||
"$TAG" \
|
"$TAG" \
|
||||||
-e py27,py34 -- "$@"
|
-e py27,py34 -- "$@"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user