From bcb977425b74fcea8c8b4ff91295b535fc0e58ea Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 12 Aug 2015 15:36:10 +0100
Subject: [PATCH] Only use overlay driver in CI

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/ci            | 1 +
 script/test-versions | 1 +
 script/wrapdocker    | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/script/ci b/script/ci
index 2e4ec9197..b49754878 100755
--- a/script/ci
+++ b/script/ci
@@ -9,6 +9,7 @@
 set -e
 
 export DOCKER_VERSIONS=all
+export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
diff --git a/script/test-versions b/script/test-versions
index 9e81a515d..ae9620e38 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -21,6 +21,7 @@ for version in $DOCKER_VERSIONS; do
     --volume="/var/lib/docker" \
     --volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \
     -e "DOCKER_VERSION=$version" \
+    -e "DOCKER_DAEMON_ARGS" \
     --entrypoint="script/dind" \
     "$TAG" \
     script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@"
diff --git a/script/wrapdocker b/script/wrapdocker
index 3e669b5d7..ab89f5ed6 100755
--- a/script/wrapdocker
+++ b/script/wrapdocker
@@ -7,7 +7,9 @@ fi
 # If a pidfile is still around (for example after a container restart),
 # delete it so that docker can start.
 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=$!
 
 >&2 echo "Waiting for Docker to start..."