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

Merge pull request #1432 from abronan/fix_ci 

Update docker version for swarm-test-env
This commit is contained in:
Andrea Luzzardi 2015-11-25 15:23:53 +01:00
parent 1b2afce425 c4f85c531a
commit 58ee815ec2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/Dockerfile
View File

@ -1,7 +1,7 @@
# Dockerfile for swarm integration test environment. # Dockerfile for swarm integration test environment.
# Use with run_in_docker.sh # Use with run_in_docker.sh
FROM dockerswarm/dind:1.6.0 FROM dockerswarm/dind:1.9.0
# Install dependencies. # Install dependencies.
RUN apt-get update && apt-get install -y --no-install-recommends git file \ RUN apt-get update && apt-get install -y --no-install-recommends git file \

2
test/integration/run.sh
View File

@ -14,7 +14,7 @@ SWARM_ROOT=$(cd ../..; pwd -P)
INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-dockerswarm/swarm-test-env} INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-dockerswarm/swarm-test-env}
# Make sure we upgrade the integration environment. # Make sure we upgrade the integration environment.
#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 \ ID=$(docker run -d -t --privileged \

2
test/integration/test_runner.sh
View File

@ -25,7 +25,7 @@ execute chmod +x /usr/local/bin/docker-compose
execute time go build -o "$SWARM_BINARY" ../.. execute time go build -o "$SWARM_BINARY" ../..
# Start the docker engine. # Start the docker engine.
execute docker --daemon --log-level=panic \ execute docker daemon --log-level=panic \
--storage-driver="$STORAGE_DRIVER" & --storage-driver="$STORAGE_DRIVER" &
DOCKER_PID=$! DOCKER_PID=$!