Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 7367d1face into c33dedf10b

Browse source
This commit is contained in:
senzacionale 2018-12-11 19:17:26 +00:00 committed by GitHub
commit 44ddf41110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,5 +1,5 @@
FROM nginx:1.14.1 FROM nginx:1.14.1
LABEL maintainer="Jason Wilder mail@jasonwilder.com" LABEL maintainer="Mitja Bombac mitja.bombac@gmail.com"
# Install wget and install/updates certificates # Install wget and install/updates certificates
RUN apt-get update \ RUN apt-get update \

2
Dockerfile.alpine
View file

@ -1,5 +1,5 @@
FROM nginx:1.14.1-alpine FROM nginx:1.14.1-alpine
LABEL maintainer="Jason Wilder mail@jasonwilder.com" LABEL maintainer="Mitja Bombac mitja.bombac@gmail.com"
# Install wget and install/updates certificates # Install wget and install/updates certificates
RUN apk add --no-cache --virtual .run-deps \ RUN apk add --no-cache --virtual .run-deps \

4
README.md
View file

@ -24,11 +24,11 @@ Provided your DNS is setup to forward foo.bar.com to the host running nginx-prox
The nginx-proxy images are available in two flavors. The nginx-proxy images are available in two flavors.
#### jwilder/nginx-proxy:latest #### senzacionale/nginx-proxy:latest
This image uses the debian:jessie based nginx image. This image uses the debian:jessie based nginx image.
$ docker pull jwilder/nginx-proxy:latest $ docker pull senzacionale/nginx-proxy:latest
#### jwilder/nginx-proxy:alpine #### jwilder/nginx-proxy:alpine

19
nginx.tmpl
View file

@ -9,19 +9,14 @@
{{/* If there is no swarm node or the port is not published on host, use container's IP:PORT */}} {{/* If there is no swarm node or the port is not published on host, use container's IP:PORT */}}
{{ else if .Network }} {{ else if .Network }}
# {{ .Container.Name }} # {{ .Container.Name }}
server {{ .Network.IP }}:{{ .Address.Port }}; server {{ .Network }}:{{ .Address.Port }};
{{ end }} {{ end }}
{{ else if .Network }} {{ else if .Network }}
# {{ .Container.Name }} # {{ .Container.Name }}
{{ if .Network.IP }} server {{ .Network }} down;
server {{ .Network.IP }} down;
{{ else }}
server 127.0.0.1 down;
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ end }}
# If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the # If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
# scheme used to connect to this server # scheme used to connect to this server
map $http_x_forwarded_proto $proxy_x_forwarded_proto { map $http_x_forwarded_proto $proxy_x_forwarded_proto {
@ -129,22 +124,20 @@ upstream {{ $upstream_name }} {
{{ range $knownNetwork := $CurrentContainer.Networks }} {{ range $knownNetwork := $CurrentContainer.Networks }}
{{ range $containerNetwork := $container.Networks }} {{ range $containerNetwork := $container.Networks }}
{{ if (and (ne $containerNetwork.Name "ingress") (or (eq $knownNetwork.Name $containerNetwork.Name) (eq $knownNetwork.Name "host"))) }} {{ if eq $knownNetwork.Name $containerNetwork.Name }}
## Can be connected with "{{ $containerNetwork.Name }}" network ## Can be connected with "{{ $containerNetwork.Name }}" network
{{ $containerNetworkIp := or $container.Env.DEFAULT_IP $containerNetwork.IP }}
{{/* If only 1 port exposed, use that */}} {{/* If only 1 port exposed, use that */}}
{{ if eq $addrLen 1 }} {{ if eq $addrLen 1 }}
{{ $address := index $container.Addresses 0 }} {{ $address := index $container.Addresses 0 }}
{{ template "upstream" (dict "Container" $container "Address" $address "Network" $containerNetwork) }} {{ template "upstream" (dict "Container" $container "Address" $address "Network" $containerNetworkIp) }}
{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var, falling back to standard web port 80 */}} {{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var, falling back to standard web port 80 */}}
{{ else }} {{ else }}
{{ $port := coalesce $container.Env.VIRTUAL_PORT "80" }} {{ $port := coalesce $container.Env.VIRTUAL_PORT "80" }}
{{ $address := where $container.Addresses "Port" $port | first }} {{ $address := where $container.Addresses "Port" $port | first }}
{{ template "upstream" (dict "Container" $container "Address" $address "Network" $containerNetwork) }} {{ template "upstream" (dict "Container" $container "Address" $address "Network" $containerNetworkIp) }}
{{ end }} {{ end }}
{{ else }}
# Cannot connect to network of this container
server 127.0.0.1 down;
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}