1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-12-25 03:56:31 +00:00

Upgrade Docker dependency from 1.9 to 1.10

This commit is contained in:
Baptiste Donaux 2016-03-24 14:40:50 +01:00
parent 88cc096aaf
commit 6928d62e1e
3 changed files with 3 additions and 4 deletions

View File

@ -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 .

View File

@ -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

View File

@ -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
}