reconfigure-local-caddy

Dockerfile

@@ -77,9 +77,6 @@ COPY ./bin ./bin/
 
 RUN chown -R deepchecks.deepchecks /code
 
-COPY ./deploy/local_certs/CA/rootCA.pem /usr/local/share/ca-certificates/deepchecksRootCA.crt
-RUN update-ca-certificates
-
 USER deepchecks
 
 # Expose container port and run entry point script

deploy-oss.sh

@@ -117,49 +117,6 @@ then
 export TLS_BLOCK="acme_ca https://acme-staging-v02.api.letsencrypt.org/directory"
 fi
 
-# rewrite caddyfile
-rm -f Caddyfile
-if [[ $ENABLE_HTTP == 'true' ]]; then
-  export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-  envsubst > Caddyfile <<EOF
-{
-  auto_https disable_redirects
-}
-$DOMAIN:8443 {
-    tls /certs/localhost.crt /certs/localhost.key
-
-    reverse_proxy http://casdoor:4545 {
-        header_up Host {upstream_hostport}
-        header_up X-Real-IP {remote_host}
-    }
-}
-$DOMAIN, :443 {
-    tls /certs/localhost.crt /certs/localhost.key
-
-    reverse_proxy http://app:8000
-}
-$DOMAIN:80 {
-    reverse_proxy http://app:8000
-}
-EOF
-else
-  envsubst > Caddyfile <<EOF
-{
-  $TLS_BLOCK
-}
-$DOMAIN:8443 {
-    reverse_proxy http://casdoor:4545 {
-        header_up Host {upstream_hostport}
-        header_up X-Real-IP {remote_host}
-    }
-}
-$DOMAIN, :80, :443 {
-    reverse_proxy http://app:8000
-}
-EOF
-
-fi;
-
 # Write .env file
 envsubst > .env <<EOF
 DEEPCHECKS_SECRET=$DEEPCHECKS_SECRET

deploy/caddyfile

@@ -0,0 +1,18 @@
+{
+    auto_https disable_redirects
+}
+
+{$DOMAIN:localhost}:8443 {
+    reverse_proxy http://casdoor:4545 {
+        header_up Host {upstream_hostport}
+        header_up X-Real-IP {remote_host}
+    }
+}
+
+{$DOMAIN:localhost}, :443 {
+    reverse_proxy http://app:8000
+}
+
+{$DOMAIN:localhost}:80 {
+    reverse_proxy http://app:8000
+}

deploy/docker-compose.yml

@@ -166,8 +166,7 @@ services:
       - '443:443'
       - '8443:8443'
     volumes:
-      - ./Caddyfile:/etc/caddy/Caddyfile
-      - ./monitoring/deploy/local_certs/certs:/certs
+      - ./monitoring/deploy/.caddyfile:/etc/caddy/Caddyfile
     depends_on:
       - app
     networks: