Merge pull request #1432 from abronan/fix_ci

Update docker version for swarm-test-env

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 \

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 \

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=$!