reconfigure-local-caddy

Dockerfile

@@ -26,7 +26,7 @@
 
 FROM ubuntu:22.04
 
 ENV PYTHONUNBUFFERED 1
 ENV TZ=Asia/Jerusalem
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
@@ -44,7 +44,7 @@
 ARG MIXPANEL_ID
 ENV MIXPANEL_ID=$MIXPANEL_ID
 # ---
 ARG DEEPCHECKS_CI_TOKEN
 
 RUN ln -s /usr/bin/python3.11 /usr/bin/python && python -m pip install -U pip==25.1.1 setuptools==80.9.0 --no-cache-dir
 # For ARM arch, ray>2.3.1 uses grpcio==1.51.3 which doesn't has wheel and takes forever to build from source
@@ -77,9 +77,6 @@
 
 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

backend/client/requirements.txt

@@ -7,7 +7,7 @@ fastjsonschema==2.16.2
 termcolor
 PyYAML
 importlib_metadata; python_version < '3.8'
-pip-system-certs>=3.1
+pip-system-certs>=3.1,<5
 typing_extensions>=4.11.0,<5
 rfc3339-validator==0.1.4 # Used to validate date-time format in jsonschema
 packaging==23.0

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:

liccheck.ini

@@ -18,6 +18,7 @@ authorized_licenses:
 	Apache License, Version 2.0
         Apache-2.0
         Apache-2.0 AND BSD-2-Clause
+        Apache License 2.0
 
         gnu lgpl
         GNU Library or Lesser General Public License (LGPL)

makefile

@@ -130,7 +130,7 @@ $(ENV):
 	@echo "#### Creating Python Vertual Enviroment [ $(ENV) ] ####"
 	@test -d $(ENV) || $(ext_py) -m venv $(ENV)
 	@$(PIP) install -e backend/
-	@$(PIP) install -U pip setuptools ray==2.9.0
+	@$(PIP) install -U pip setuptools wheel ray==2.9.0
 
 
 requirements: $(ENV)