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

Merge pull request #1853 from aanand/only-use-overlay-in-ci 

Only use overlay driver in CI
This commit is contained in:
Aanand Prasad 2015-08-12 17:05:59 +01:00
parent c443e95f07 bcb977425b
commit 711b0b4daf
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
script/ci
View File

@ -9,6 +9,7 @@
set -e set -e
export DOCKER_VERSIONS=all export DOCKER_VERSIONS=all
export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
. script/test-versions . script/test-versions
>&2 echo "Building Linux binary" >&2 echo "Building Linux binary"

1
script/test-versions
View File

@ -21,6 +21,7 @@ for version in $DOCKER_VERSIONS; do
--volume="/var/lib/docker" \ --volume="/var/lib/docker" \
--volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \ --volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \
-e "DOCKER_VERSION=$version" \ -e "DOCKER_VERSION=$version" \
-e "DOCKER_DAEMON_ARGS" \
--entrypoint="script/dind" \ --entrypoint="script/dind" \
"$TAG" \ "$TAG" \
script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@" script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@"

4
script/wrapdocker
View File

@ -7,7 +7,9 @@ fi
# If a pidfile is still around (for example after a container restart), # If a pidfile is still around (for example after a container restart),
# delete it so that docker can start. # delete it so that docker can start.
rm -rf /var/run/docker.pid rm -rf /var/run/docker.pid
docker -d --storage-driver="overlay" &>/var/log/docker.log & docker_command="docker -d $DOCKER_DAEMON_ARGS"
>&2 echo "Starting Docker with: $docker_command"
$docker_command &>/var/log/docker.log &
docker_pid=$! docker_pid=$!
>&2 echo "Waiting for Docker to start..." >&2 echo "Waiting for Docker to start..."