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

Improve port configuration

Browse source 
Should address #6.

The port selection now works as follows:

* If there is only 1 port exposed by the container, that port is used.
* If there is a VIRTUAL_PORT env variable defined, that port is used.
* Otherwise, default to port 80, if exposed.
This commit is contained in:
Jason Wilder 2014-05-19 21:10:53 -06:00
parent 92be4fa1ca
commit 592ed499d7
3 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -14,8 +14,8 @@ RUN mkdir /app
WORKDIR /app WORKDIR /app
ADD . /app ADD . /app
RUN wget https://github.com/jwilder/docker-gen/releases/download/0.1.2/docker-gen-linux-amd64-0.1.2.tar.gz RUN wget https://github.com/jwilder/docker-gen/releases/download/0.2.1/docker-gen-linux-amd64-0.2.1.tar.gz
RUN tar xvzf docker-gen-linux-amd64-0.1.2.tar.gz RUN tar xvzf docker-gen-linux-amd64-0.2.1.tar.gz
RUN mkdir -p /var/log/supervisor RUN mkdir -p /var/log/supervisor
ADD supervisor.conf /etc/supervisor/conf.d/supervisor.conf ADD supervisor.conf /etc/supervisor/conf.d/supervisor.conf

25
nginx.tmpl
View file

@ -2,11 +2,34 @@
upstream {{ $host }} { upstream {{ $host }} {
{{ range $index, $value := $containers }} {{ range $index, $value := $containers }}
{{ $addrLen := len $value.Addresses }}
{{/* If only 1 port exposed, use that */}}
{{ if eq $addrLen 1 }}
{{ with $address := index $value.Addresses 0 }} {{ with $address := index $value.Addresses 0 }}
server {{ $value.Gateway }}:{{ $address.HostPort }}; # {{$value.Name}}
server {{ $address.IP }}:{{ $address.Port }};
{{ end }}
{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var */}}
{{ else if $value.Env.VIRTUAL_PORT }}
{{ range $i, $address := $value.Addresses }}
{{ if eq $address.Port $value.Env.VIRTUAL_PORT }}
# {{$value.Name}}
server {{ $address.IP }}:{{ $address.Port }};
{{ end }} {{ end }}
{{ end }} {{ end }}
{{/* Else default to standard web port 80 */}}
{{ else }}
{{ range $i, $address := $value.Addresses }}
{{ if eq $address.Port "80" }}
# {{$value.Name}}
server {{ $address.IP }}:{{ $address.Port }};
{{ end }}
{{ end }}
{{ end }}
{{ end }}
} }
server { server {

2
supervisor.conf
View file

@ -6,6 +6,6 @@ command=nginx
directory=/etc/nginx directory=/etc/nginx
[program:docker-gen] [program:docker-gen]
command=./docker-gen -watch -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/sites-enabled/default command=./docker-gen -watch -only-exposed -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/sites-enabled/default
directory=/app directory=/app