Merge branch 'master' of https://github.com/jwilder/nginx-proxy
This commit is contained in:
commit
99963b4ab0
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 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 .
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue