From 74782a56b53638431c93f0081e8d933f7fc0a104 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 25 Aug 2015 10:57:21 -0400
Subject: [PATCH] Fix script/test by just calling script/test-versions directly
 instead of launching another container.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 script/ci            |  1 +
 script/test          | 15 +++++----------
 script/test-versions |  5 ++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/script/ci b/script/ci
index b49754878..e8356bb73 100755
--- a/script/ci
+++ b/script/ci
@@ -10,6 +10,7 @@ set -e
 
 export DOCKER_VERSIONS=all
 export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
+GIT_VOLUME="--volumes-from=$(hostname)"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
diff --git a/script/test b/script/test
index adf3fb1ba..bdb3579b0 100755
--- a/script/test
+++ b/script/test
@@ -6,15 +6,10 @@ set -ex
 TAG="docker-compose:$(git rev-parse --short HEAD)"
 
 rm -rf coverage-html
+# Create the host directory so it's owned by $USER
+mkdir -p coverage-html
 
 docker build -t "$TAG" .
-docker run \
-  --rm \
-  --volume="/var/run/docker.sock:/var/run/docker.sock" \
-  -e DOCKER_VERSIONS \
-  -e "TAG=$TAG" \
-  -e "affinity:image==$TAG" \
-  -e "COVERAGE_DIR=$(pwd)/coverage-html" \
-  --entrypoint="script/test-versions" \
-  "$TAG" \
-  "$@"
+
+GIT_VOLUME="--volume=$(pwd)/.git:/code/.git"
+. script/test-versions
diff --git a/script/test-versions b/script/test-versions
index f39c17e81..88d2554c2 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -5,7 +5,10 @@
 set -e
 
 >&2 echo "Running lint checks"
-tox -e pre-commit
+docker run --rm \
+  ${GIT_VOLUME} \
+  --entrypoint="tox" \
+  "$TAG" -e pre-commit
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="default"