Merge pull request #817 from aaronlehmann/docker-integration-fixes-2
Two more Docker integration test fixes
This commit is contained in:
commit
78caa1fc93
2 changed files with 3 additions and 8 deletions
|
@ -35,7 +35,7 @@ RUN cd /usr/local/src/ \
|
||||||
&& ./install.sh /usr/local
|
&& ./install.sh /usr/local
|
||||||
|
|
||||||
# Install docker-compose
|
# Install docker-compose
|
||||||
RUN curl -L https://github.com/docker/compose/releases/download/1.2.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose \
|
RUN curl -L https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose \
|
||||||
&& chmod +x /usr/local/bin/docker-compose
|
&& chmod +x /usr/local/bin/docker-compose
|
||||||
|
|
||||||
RUN mkdir -p /go/src/github.com/docker/distribution
|
RUN mkdir -p /go/src/github.com/docker/distribution
|
||||||
|
|
|
@ -23,14 +23,9 @@ INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration}
|
||||||
docker pull $INTEGRATION_IMAGE
|
docker pull $INTEGRATION_IMAGE
|
||||||
|
|
||||||
# Start the integration tests in a Docker container.
|
# Start the integration tests in a Docker container.
|
||||||
ID=$(docker run -d -t --privileged $volumeMount $dockerMount \
|
docker run --rm -t --privileged $volumeMount $dockerMount \
|
||||||
-v ${DISTRIBUTION_ROOT}:/go/src/github.com/docker/distribution \
|
-v ${DISTRIBUTION_ROOT}:/go/src/github.com/docker/distribution \
|
||||||
-e "STORAGE_DRIVER=$DOCKER_GRAPHDRIVER" \
|
-e "STORAGE_DRIVER=$DOCKER_GRAPHDRIVER" \
|
||||||
-e "EXEC_DRIVER=$EXEC_DRIVER" \
|
-e "EXEC_DRIVER=$EXEC_DRIVER" \
|
||||||
${INTEGRATION_IMAGE} \
|
${INTEGRATION_IMAGE} \
|
||||||
./test_runner.sh "$@")
|
./test_runner.sh "$@"
|
||||||
|
|
||||||
# Clean it up when we exit.
|
|
||||||
trap "docker rm -f -v $ID > /dev/null" EXIT
|
|
||||||
|
|
||||||
docker logs -f $ID
|
|
||||||
|
|
Loading…
Reference in a new issue