Merge pull request #1316 from dmcgowan/fix-janky-integration-tests

Fix broken daemon startup with master
This commit is contained in:
Stephen Day 2016-01-04 17:51:51 -08:00
commit f277c660ae
3 changed files with 12 additions and 4 deletions

View file

@ -38,13 +38,13 @@ docker pull $INTEGRATION_IMAGE
ID=$(docker run -d -it --privileged $volumeMount $dockerMount \
-v ${DISTRIBUTION_ROOT}:/go/src/github.com/docker/distribution \
-e "DOCKER_GRAPHDRIVER=$DOCKER_GRAPHDRIVER" \
-e "EXEC_DRIVER=$EXEC_DRIVER" \
${INTEGRATION_IMAGE} \
./run_engine.sh)
# Stop container on exit
trap "docker rm -f -v $ID" EXIT
# Wait for it to become reachable.
tries=10
until docker exec "$ID" docker version &> /dev/null; do

View file

@ -11,5 +11,13 @@ echo "$IP localregistry" >> /etc/hosts
sh install_certs.sh localregistry
docker --daemon --log-level=panic \
--storage-driver="$DOCKER_GRAPHDRIVER" --exec-driver="$EXEC_DRIVER"
DOCKER_VERSION=$(docker --version | cut -d ' ' -f3 | cut -d ',' -f1)
major=$(echo "$DOCKER_VERSION"| cut -d '.' -f1)
minor=$(echo "$DOCKER_VERSION"| cut -d '.' -f2)
daemonOpts="daemon"
if [ $major -le 1 ] && [ $minor -lt 9 ]; then
daemonOpts="--daemon"
fi
docker $daemonOpts --log-level=debug --storage-driver="$DOCKER_GRAPHDRIVER"

View file

@ -23,7 +23,7 @@ fi
# Released versions
versions="1.6.0 1.6.1 1.7.0 1.7.1"
versions="1.6.1 1.7.1 1.8.3 1.9.1"
for v in $versions; do
echo "Extracting Docker $v from dind image"