Skip to content

Commit 53f25e5

Browse files
committed
Fixed trailing comma handling
1 parent f5675b1 commit 53f25e5

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

app/letsencrypt_service_data.tmpl

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,17 @@
2222
LETSENCRYPT_CONTAINERS=({{ range $cid := $scopedContainersSlice }}{{ if trim $cid }}'{{ trim $cid }}' {{ end }}{{ end }})
2323

2424
{{ range $hosts, $containers := groupBy $ "Env.LETSENCRYPT_HOST" }}
25-
{{ if trimSuffix "," $hosts }}
26-
{{ range $container := $containers }}
27-
{{ $cid := printf "%.12s" $container.ID }}
28-
{{ if intersect $scopedContainersSlice (split $cid " ") }}
29-
LETSENCRYPT_{{ $cid }}_HOST=( {{ range $host := split $hosts "," }}{{ $host := trim $host }}'{{ $host }}' {{ end }})
30-
LETSENCRYPT_{{ $cid }}_EMAIL="{{ $container.Env.LETSENCRYPT_EMAIL }}"
31-
LETSENCRYPT_{{ $cid }}_KEYSIZE="{{ $container.Env.LETSENCRYPT_KEYSIZE }}"
32-
LETSENCRYPT_{{ $cid }}_TEST="{{ $container.Env.LETSENCRYPT_TEST }}"
33-
LETSENCRYPT_{{ $cid }}_ACCOUNT_ALIAS="{{ $container.Env.LETSENCRYPT_ACCOUNT_ALIAS }}"
34-
LETSENCRYPT_{{ $cid }}_RESTART_CONTAINER="{{ $container.Env.LETSENCRYPT_RESTART_CONTAINER }}"
35-
LETSENCRYPT_{{ $cid }}_MIN_VALIDITY="{{ $container.Env.LETSENCRYPT_MIN_VALIDITY }}"
36-
{{ end }}
25+
{{ $hosts := trimSuffix "," $hosts }}
26+
{{ range $container := $containers }}
27+
{{ $cid := printf "%.12s" $container.ID }}
28+
{{ if intersect $scopedContainersSlice (split $cid " ") }}
29+
LETSENCRYPT_{{ $cid }}_HOST=( {{ range $host := split $hosts "," }}{{ $host := trim $host }}'{{ $host }}' {{ end }})
30+
LETSENCRYPT_{{ $cid }}_EMAIL="{{ $container.Env.LETSENCRYPT_EMAIL }}"
31+
LETSENCRYPT_{{ $cid }}_KEYSIZE="{{ $container.Env.LETSENCRYPT_KEYSIZE }}"
32+
LETSENCRYPT_{{ $cid }}_TEST="{{ $container.Env.LETSENCRYPT_TEST }}"
33+
LETSENCRYPT_{{ $cid }}_ACCOUNT_ALIAS="{{ $container.Env.LETSENCRYPT_ACCOUNT_ALIAS }}"
34+
LETSENCRYPT_{{ $cid }}_RESTART_CONTAINER="{{ $container.Env.LETSENCRYPT_RESTART_CONTAINER }}"
35+
LETSENCRYPT_{{ $cid }}_MIN_VALIDITY="{{ $container.Env.LETSENCRYPT_MIN_VALIDITY }}"
3736
{{ end }}
3837
{{ end }}
3938
{{ end }}

0 commit comments

Comments
 (0)