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

Update to docker-gen 0.7.3

Browse source
This commit is contained in:
Jason Wilder 2016-06-13 00:22:50 -06:00
parent d1e6e1c0be
commit 8ed5ab38b8
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 ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego
RUN chmod u+x /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 \ 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 \ && 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 .PHONY : test
update-dependencies: 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 nginx:1.9.12
docker pull python:3 docker pull python:3
docker pull rancher/socat-docker:latest 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 \ -v $BATS_TEST_DIRNAME/../nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro \
--volumes-from bats-nginx \ --volumes-from bats-nginx \
--expose 80 \ --expose 80 \
jwilder/docker-gen:0.7.1 \ jwilder/docker-gen:0.7.3 \
-notify-sighup bats-nginx \ -notify-sighup bats-nginx \
-watch \ -watch \
-only-exposed \ -only-exposed \