From f2944386dfa513db20437dcf854cf4ea786476f5 Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Fri, 20 Nov 2015 16:53:54 -0800 Subject: [PATCH 1/3] Update Docker version in swarm-test-env Dockerfile Update the version of docker to 1.9.0 because of helpers removal in hack/dind script that was mounting the cgroups. It's now done automatically inside the containers as of 1.8.0. Signed-off-by: Alexandre Beslic --- test/integration/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/Dockerfile b/test/integration/Dockerfile index 78fe544824..f75c3c3e75 100644 --- a/test/integration/Dockerfile +++ b/test/integration/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile for swarm integration test environment. # Use with run_in_docker.sh -FROM dockerswarm/dind:1.6.0 +FROM dockerswarm/dind:1.9.0 # Install dependencies. RUN apt-get update && apt-get install -y --no-install-recommends git file \ From bb26c7c1649c55748dad4ccb375266f5b1b795c3 Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Sun, 22 Nov 2015 14:58:44 -0800 Subject: [PATCH 2/3] replace deprecated --daemon flag by daemon when starting docker in test runner Signed-off-by: Alexandre Beslic --- test/integration/test_runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test_runner.sh b/test/integration/test_runner.sh index 54c5d260a6..f706f6053a 100755 --- a/test/integration/test_runner.sh +++ b/test/integration/test_runner.sh @@ -25,7 +25,7 @@ execute chmod +x /usr/local/bin/docker-compose execute time go build -o "$SWARM_BINARY" ../.. # Start the docker engine. -execute docker --daemon --log-level=panic \ +execute docker daemon --log-level=panic \ --storage-driver="$STORAGE_DRIVER" & DOCKER_PID=$! From c4f85c531a8344c401744c7c89fa27c761307144 Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Sun, 22 Nov 2015 15:31:57 -0800 Subject: [PATCH 3/3] upgrade integration environment Signed-off-by: Alexandre Beslic --- test/integration/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/run.sh b/test/integration/run.sh index 5ccbd64399..9f0f829d32 100755 --- a/test/integration/run.sh +++ b/test/integration/run.sh @@ -14,7 +14,7 @@ SWARM_ROOT=$(cd ../..; pwd -P) INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-dockerswarm/swarm-test-env} # Make sure we upgrade the integration environment. -#docker pull $INTEGRATION_IMAGE +docker pull $INTEGRATION_IMAGE # Start the integration tests in a Docker container. ID=$(docker run -d -t --privileged \