Merge branch 'master' into portal-latest

This commit is contained in:
Filip Rysavy 2021-09-24 13:32:21 +02:00
commit f3f0294d44
No known key found for this signature in database
GPG Key ID: EA1F430401C92D99
3 changed files with 5 additions and 5 deletions

View File

@ -0,0 +1 @@
- fixed issue with caddy requesting new certificates instead of using existing ones from file storage

View File

@ -3,7 +3,7 @@ FROM caddy:2.4.5-builder AS caddy-builder
# available dns resolvers: https://github.com/caddy-dns # available dns resolvers: https://github.com/caddy-dns
RUN xcaddy build --with github.com/caddy-dns/route53 RUN xcaddy build --with github.com/caddy-dns/route53
FROM caddy:2.4.5-builder FROM caddy:2.4.5-alpine
COPY --from=caddy-builder /usr/bin/caddy /usr/bin/caddy COPY --from=caddy-builder /usr/bin/caddy /usr/bin/caddy

View File

@ -20,13 +20,12 @@
"issuers": [ "issuers": [
{ {
"module": "acme", "module": "acme",
"email": "{{EMAIL_ADDRESS}}",
"challenges": { "challenges": {
"dns": { "dns": {
"provider": { "provider": {
"name": "route53", "name": "route53"
"max_retries": 100 }
},
"ttl": "15m"
} }
} }
} }