remove incorrect usage of coalesce

codekitchen · codekitchen · commit abfe5203ff91 · 2016-02-22T15:20:26.000-07:00
diff --git a/nginx.tmpl b/nginx.tmpl
@@ -43,7 +43,7 @@ proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
 upstream {{ .Host }} {
 {{ range $container := .Containers }}
 	{{ $port := coalesce $container.Env.VIRTUAL_PORT (first $container.Addresses).Port "80" }}
-	{{ $address := coalesce (first $container.Addresses).IP (first $container.Networks).IP }}
+	{{ $address := or (first $container.Addresses).IP (first $container.Networks).IP }}
 	server {{ $address }}:{{ $port }};
 {{ end }}
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;`
`43`	`43`	`upstream {{ .Host }} {`
`44`	`44`	`{{ range $container := .Containers }}`
`45`	`45`	`{{ $port := coalesce $container.Env.VIRTUAL_PORT (first $container.Addresses).Port "80" }}`
`46`		`- {{ $address := coalesce (first $container.Addresses).IP (first $container.Networks).IP }}`
	`46`	`+ {{ $address := or (first $container.Addresses).IP (first $container.Networks).IP }}`
`47`	`47`	`server {{ $address }}:{{ $port }};`
`48`	`48`	`{{ end }}`
`49`	`49`	`}`