Merge pull request #314 from thomasleveil/circleci-docker1.9.1
CircleCI: make tests run on Docker 1.9.1
This commit is contained in:
commit
f42bf9175d
3 changed files with 4 additions and 4 deletions
2
Makefile
2
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.7
|
||||
docker pull docker:1.9
|
||||
|
||||
test:
|
||||
docker build -t jwilder/nginx-proxy:bats .
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
machine:
|
||||
pre:
|
||||
# install docker 1.7.1
|
||||
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.7.1-circleci'; sudo chmod 0755 /usr/bin/docker; true
|
||||
- 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
|
||||
services:
|
||||
- docker
|
||||
|
||||
|
|
|
@ -56,5 +56,5 @@ function docker_tcp {
|
|||
--expose 2375 \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
rancher/socat-docker
|
||||
docker run --link "$container_name:docker" docker:1.7 version
|
||||
docker run --link "$container_name:docker" docker:1.9 version
|
||||
}
|
||||
|
|
Reference in a new issue