mirror of
https://github.com/docker/compose.git
synced 2025-07-23 21:54:40 +02:00
Fix script/test by just calling script/test-versions directly instead of launching another container.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
parent
5a5f28228a
commit
74782a56b5
@ -10,6 +10,7 @@ set -e
|
|||||||
|
|
||||||
export DOCKER_VERSIONS=all
|
export DOCKER_VERSIONS=all
|
||||||
export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
|
export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
|
||||||
|
GIT_VOLUME="--volumes-from=$(hostname)"
|
||||||
. script/test-versions
|
. script/test-versions
|
||||||
|
|
||||||
>&2 echo "Building Linux binary"
|
>&2 echo "Building Linux binary"
|
||||||
|
15
script/test
15
script/test
@ -6,15 +6,10 @@ set -ex
|
|||||||
TAG="docker-compose:$(git rev-parse --short HEAD)"
|
TAG="docker-compose:$(git rev-parse --short HEAD)"
|
||||||
|
|
||||||
rm -rf coverage-html
|
rm -rf coverage-html
|
||||||
|
# Create the host directory so it's owned by $USER
|
||||||
|
mkdir -p coverage-html
|
||||||
|
|
||||||
docker build -t "$TAG" .
|
docker build -t "$TAG" .
|
||||||
docker run \
|
|
||||||
--rm \
|
GIT_VOLUME="--volume=$(pwd)/.git:/code/.git"
|
||||||
--volume="/var/run/docker.sock:/var/run/docker.sock" \
|
. script/test-versions
|
||||||
-e DOCKER_VERSIONS \
|
|
||||||
-e "TAG=$TAG" \
|
|
||||||
-e "affinity:image==$TAG" \
|
|
||||||
-e "COVERAGE_DIR=$(pwd)/coverage-html" \
|
|
||||||
--entrypoint="script/test-versions" \
|
|
||||||
"$TAG" \
|
|
||||||
"$@"
|
|
||||||
|
@ -5,7 +5,10 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
>&2 echo "Running lint checks"
|
>&2 echo "Running lint checks"
|
||||||
tox -e pre-commit
|
docker run --rm \
|
||||||
|
${GIT_VOLUME} \
|
||||||
|
--entrypoint="tox" \
|
||||||
|
"$TAG" -e pre-commit
|
||||||
|
|
||||||
if [ "$DOCKER_VERSIONS" == "" ]; then
|
if [ "$DOCKER_VERSIONS" == "" ]; then
|
||||||
DOCKER_VERSIONS="default"
|
DOCKER_VERSIONS="default"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user