From 6928d62e1ec78502a5b71088438fbf5ef45e0a25 Mon Sep 17 00:00:00 2001 From: Baptiste Donaux Date: Thu, 24 Mar 2016 14:40:50 +0100 Subject: [PATCH] Upgrade Docker dependency from 1.9 to 1.10 --- Makefile | 2 +- circle.yml | 3 +-- test/lib/docker_helpers.bash | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 213a441..3a10ad4 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ update-dependencies: docker pull python:3 docker pull rancher/socat-docker:latest docker pull appropriate/curl:latest - docker pull docker:1.9 + docker pull docker:1.10 test: docker build -t jwilder/nginx-proxy:bats . diff --git a/circle.yml b/circle.yml index e0ecf4d..761684f 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,6 @@ machine: pre: - - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci' - - sudo chmod 0755 /usr/bin/docker + - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0 services: - docker diff --git a/test/lib/docker_helpers.bash b/test/lib/docker_helpers.bash index 1735506..221234e 100644 --- a/test/lib/docker_helpers.bash +++ b/test/lib/docker_helpers.bash @@ -62,5 +62,5 @@ function docker_tcp { --expose 2375 \ -v /var/run/docker.sock:/var/run/docker.sock \ rancher/socat-docker - docker run --label bats-type="docker" --link "$container_name:docker" docker:1.9 version + docker run --label bats-type="docker" --link "$container_name:docker" docker:1.10 version }