Merge pull request #1078 from nginx-proxy/1049

fix: handle most recently created containers first
nginx-proxy · May 4, 2024 · 624a9ec · 624a9ec
2 parents 3aced4b + cb69387
commit 624a9ec
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/app/letsencrypt_service_data.tmpl b/app/letsencrypt_service_data.tmpl
@@ -1,20 +1,21 @@
+#!/bin/bash
+# shellcheck disable=SC2034
 LETSENCRYPT_CONTAINERS=(
-    {{ range $hosts, $containers := groupBy $ "Env.LETSENCRYPT_HOST" }}
-        {{ if trim $hosts }}
-            {{ range $container := $containers }}
-                {{ if parseBool (coalesce $container.Env.LETSENCRYPT_SINGLE_DOMAIN_CERTS "false") }}
-                    {{/* Explicit per-domain splitting of the certificate */}}
-                    {{ range $host := split $hosts "," }}
-                        {{ $host := trim $host }}
-                        {{- "\t"}}'{{ printf "%.12s" $container.ID }}_{{ sha1 $host }}'
-                    {{ end }}
-                {{ else }}
-                    {{/* Default: multi-domain (SAN) certificate */}}
-                    {{- "\t"}}'{{ printf "%.12s" $container.ID }}'
-                {{ end }}
+{{ $orderedContainers := sortObjectsByKeysDesc $ "Created" }}
+{{ range $_, $container := whereExist $orderedContainers "Env.LETSENCRYPT_HOST" }}
+    {{ if trim $container.Env.LETSENCRYPT_HOST }}
+        {{ if parseBool (coalesce $container.Env.LETSENCRYPT_SINGLE_DOMAIN_CERTS "false") }}
+            {{/* Explicit per-domain splitting of the certificate */}}
+            {{ range $host := split $container.Env.LETSENCRYPT_HOST "," }}
+                {{ $host := trim $host }}
+{{- "\n    " }}'{{ printf "%.12s" $container.ID }}_{{ sha1 $host }}' # {{ $container.Name }}, created at {{ $container.Created }}
             {{ end }}
+        {{ else }}
+            {{/* Default: multi-domain (SAN) certificate */}}
+{{- "\n    " }}'{{ printf "%.12s" $container.ID }}' # {{ $container.Name }}, created at {{ $container.Created }}
         {{ end }}
     {{ end }}
+{{ end }}
 )
 
 {{ range $hosts, $containers := groupBy $ "Env.LETSENCRYPT_HOST" }}
@@ -34,6 +35,7 @@ LETSENCRYPT_CONTAINERS=(
         {{ $PRE_HOOK := trim (coalesce $container.Env.ACME_PRE_HOOK "") }}
         {{ $POST_HOOK := trim (coalesce $container.Env.ACME_POST_HOOK "") }}
         {{ $cid := printf "%.12s" $container.ID }}
+        {{- "\n" }}# Container {{ $cid }} ({{ $container.Name }})
         {{ if parseBool (coalesce $container.Env.LETSENCRYPT_SINGLE_DOMAIN_CERTS "false") }}
             {{/* Explicit per-domain splitting of the certificate */}}
             {{ range $host := split $hosts "," }}