zombi/nginx-proxy
Archived
11
0
Fork 0
Code Issues Pull requests Releases Activity

Use docker:1.7 image to match CircleCI's version

Browse source
This commit is contained in:
Mike Dillon 2015-10-12 21:16:55 -07:00
parent 5c6a63568d
commit 1d9db94535
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
circle.yml
View file

@ -15,9 +15,9 @@ dependencies:
- docker pull python:3 - docker pull python:3
- docker pull rancher/socat-docker - docker pull rancher/socat-docker
- docker pull appropriate/curl - docker pull appropriate/curl
- docker pull docker - docker pull docker:1.7
test: test:
override: override:
- docker build -t jwilder/nginx-proxy:bats . - docker build -t jwilder/nginx-proxy:bats .
- bats test - bats test

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 version docker run --link "$container_name:docker" docker:1.7 version
} }