From a66115f560df4efd079927730675331fd769af63 Mon Sep 17 00:00:00 2001
From: Baptiste Donaux <baptiste.donaux@gmail.com>
Date: Sun, 17 Jan 2016 12:29:55 +0100
Subject: [PATCH] Use new Network interface to support new overlay network

---
 nginx.tmpl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nginx.tmpl b/nginx.tmpl
index 255cc35..468bbd2 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -5,13 +5,13 @@
 			# {{ .Container.Node.Name }}/{{ .Container.Name }}
 			server {{ .Container.Node.Address.IP }}:{{ .Address.HostPort }};
 		{{/* If there is no swarm node or the port is not published on host, use container's IP:PORT */}}
-		{{ else }}
+		{{ else if .Network }}
 			# {{ .Container.Name }}
-			server {{ .Address.IP }}:{{ .Address.Port }};
+			server {{ .Network.IP }}:{{ .Address.Port }};
 		{{ end }}
-	{{ else }}
+	{{ else if .Network }}
 		# {{ .Container.Name }}
-		server {{ .Container.IP }} down;
+		server {{ .Network.IP }} down;
 	{{ end }}
 {{ end }}
 
@@ -75,15 +75,16 @@ server {
 upstream {{ $host }} {
 {{ range $container := $containers }}
 	{{ $addrLen := len $container.Addresses }}
+	{{ $network := index $container.Networks 0 }}
 	{{/* If only 1 port exposed, use that */}}
 	{{ if eq $addrLen 1 }}
 		{{ $address := index $container.Addresses 0 }}
-		{{ template "upstream" (dict "Container" $container "Address" $address) }}
+		{{ template "upstream" (dict "Container" $container "Address" $address "Network" $network) }}
 	{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var, falling back to standard web port 80 */}}
 	{{ else }}
 		{{ $port := coalesce $container.Env.VIRTUAL_PORT "80" }}
 		{{ $address := where $container.Addresses "Port" $port | first }}
-		{{ template "upstream" (dict "Container" $container "Address" $address) }}
+		{{ template "upstream" (dict "Container" $container "Address" $address "Network" $network) }}
 	{{ end }}
 {{ end }}
 }