thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-12-25 12:06:31 +00:00
Code Issues Releases Wiki 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 rancher/socat-docker
- docker pull appropriate/curl
- docker pull docker
- docker pull docker:1.7
test:
override:
- 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 \
-v /var/run/docker.sock:/var/run/docker.sock \
rancher/socat-docker
docker run --link "$container_name:docker" docker version
docker run --link "$container_name:docker" docker:1.7 version
}