mirror of
https://github.com/docker/compose.git
synced 2025-05-09 17:10:12 +02:00
Merge pull request #2674 from dnephin/use-1.10-rc1
Test against docker 1.10.0-rc1
This commit is contained in:
commit
a677a2c1f0
@ -18,7 +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
|
||||||
DOCKER_VERSIONS="1.9.1 1.10.0-dev"
|
DOCKER_VERSIONS=$($get_versions -n 2 recent)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -38,11 +38,7 @@ for version in $DOCKER_VERSIONS; do
|
|||||||
|
|
||||||
trap "on_exit" EXIT
|
trap "on_exit" EXIT
|
||||||
|
|
||||||
if [[ $version == *"-dev" ]]; then
|
repo="dockerswarm/dind"
|
||||||
repo="dnephin/dind"
|
|
||||||
else
|
|
||||||
repo="dockerswarm/dind"
|
|
||||||
fi
|
|
||||||
|
|
||||||
docker run \
|
docker run \
|
||||||
-d \
|
-d \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user