Merge branch 'master' into portal-latest

changelog/items/bugs-fixed/fix-caddy.md

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

docker/caddy/Dockerfile

@@ -3,7 +3,7 @@ FROM caddy:2.4.5-builder AS caddy-builder
 # available dns resolvers: https://github.com/caddy-dns
 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
 

docker/caddy/caddy.json.template

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