thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-24 12:56:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #483 from jwilder/jw-docker-gen

Browse Source 
Update to docker-gen 0.7.3
This commit is contained in:
Jason Wilder 2016-06-13 08:18:07 -06:00 committed by GitHub
commit a2ab8363ca
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -17,7 +17,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego
RUN chmod u+x /usr/local/bin/forego
ENV DOCKER_GEN_VERSION 0.7.1
ENV DOCKER_GEN_VERSION 0.7.3
RUN wget https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \
&& tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \

2
Makefile
View File

@ -2,7 +2,7 @@
.PHONY : test
update-dependencies:
docker pull jwilder/docker-gen:0.7.1
docker pull jwilder/docker-gen:0.7.3
docker pull nginx:1.9.12
docker pull python:3
docker pull rancher/socat-docker:latest

2
test/docker.bats
View File

@ -74,7 +74,7 @@ load test_helpers
-v $BATS_TEST_DIRNAME/../nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro \
--volumes-from bats-nginx \
--expose 80 \
jwilder/docker-gen:0.7.1 \
jwilder/docker-gen:0.7.3 \
-notify-sighup bats-nginx \
-watch \
-only-exposed \