From 37134c44d7fbf96bd7f8402c54180a8c05ac50e2 Mon Sep 17 00:00:00 2001 From: Jan Malte Gerth Date: Mon, 20 Feb 2023 22:46:24 +0100 Subject: [PATCH] fix: Sort networks and ports before iterating This avoids unnecessary nginx restarts caused by config file churn. --- nginx.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index 2ec7b43..6ba7954 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -21,7 +21,7 @@ {{- $_ := set $globals "ssl_policy" (or ($globals.Env.SSL_POLICY) "Mozilla-Intermediate") }} {{- $_ := set $globals "networks" (dict) }} # networks available to nginx-proxy: -{{- range $globals.CurrentContainer.Networks }} +{{- range sortObjectsByKeysAsc $globals.CurrentContainer.Networks "Name" }} {{- $_ := set $globals.networks .Name . }} # {{ .Name }} {{- end }} @@ -81,7 +81,7 @@ */}} {{- define "container_port" }} {{- /* If only 1 port exposed, use that as a default, else 80. */}} - # exposed ports:{{ range $.container.Addresses }} {{ .Port }}/{{ .Proto }}{{ else }} (none){{ end }} + # exposed ports:{{ range sortObjectsByKeysAsc $.container.Addresses "Port" }} {{ .Port }}/{{ .Proto }}{{ else }} (none){{ end }} {{- $default_port := when (eq (len $.container.Addresses) 1) (first $.container.Addresses).Port "80" }} # default port: {{ $default_port }} {{- $port := or $.container.Env.VIRTUAL_PORT $default_port }}