thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 03:46:29 +00:00
Code Issues Releases Wiki Activity

CircleCI: make tests run on Docker 1.9.1

Browse Source 
See CircleCI announcement https://discuss.circleci.com/t/docker-1-9-1-is-available/1009
This commit is contained in:
Thomas LEVEIL 2015-12-14 09:18:17 +01:00
parent 205b391677
commit c11af183d8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -7,7 +7,7 @@ update-dependencies:
docker pull python:3 docker pull python:3
docker pull rancher/socat-docker:latest docker pull rancher/socat-docker:latest
docker pull appropriate/curl:latest docker pull appropriate/curl:latest
docker pull docker:1.7 docker pull docker:1.9
test: test:
docker build -t jwilder/nginx-proxy:bats . docker build -t jwilder/nginx-proxy:bats .

4
circle.yml
View File

@ -1,7 +1,7 @@
machine: machine:
pre: pre:
# install docker 1.7.1 - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'
- 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 chmod 0755 /usr/bin/docker
services: services:
- docker - docker

2
test/lib/docker_helpers.bash
View File

@ -56,5 +56,5 @@ function docker_tcp {
--expose 2375 \ --expose 2375 \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
rancher/socat-docker rancher/socat-docker
docker run --link "$container_name:docker" docker:1.7 version docker run --link "$container_name:docker" docker:1.9 version
} }