mirror of
https://github.com/thib8956/nginx-proxy
synced 2024-12-25 12:06:31 +00:00
CircleCI: make tests run on Docker 1.9.1
See CircleCI announcement https://discuss.circleci.com/t/docker-1-9-1-is-available/1009
This commit is contained in:
parent
205b391677
commit
c11af183d8
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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user