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

Merge pull request #186 from appropriate/prevent-generating-broken-config

Browse source 
Prevent generating broken config
This commit is contained in:
Jason Wilder 2015-06-29 23:40:11 -06:00
commit ae85ec013b
2 changed files with 7 additions and 5 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 \
RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego \ RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego \
&& chmod u+x /usr/local/bin/forego && chmod u+x /usr/local/bin/forego
ENV DOCKER_GEN_VERSION 0.3.9 ENV DOCKER_GEN_VERSION 0.4.0
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 \

10
nginx.tmpl
View file

@ -58,11 +58,13 @@ upstream {{ $host }} {
{{ end }} {{ end }}
{{/* Else default to standard web port 80 */}} {{/* Else default to standard web port 80 */}}
{{ else }} {{ else }}
{{ range $address := $container.Addresses }} {{ $address := where $container.Addresses "Port" "80" | first }}
{{ if eq $address.Port "80" }} {{ if $address }}
# {{$container.Name}} # {{$container.Name}}
server {{ $address.IP }}:{{ $address.Port }}; server {{ $address.IP }}:80;
{{ end }} {{ else }}
# {{$container.Name}}
server {{ $container.IP }} down;
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}