From 201587a773eda15c6b691175f875905e8b0a547e Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Thu, 17 Jul 2025 16:05:37 +0300 Subject: [PATCH 1/9] reconfigure-local-caddy --- Dockerfile | 3 -- deploy-oss.sh | 43 -------------------------- deploy/caddyfile | 18 +++++++++++ deploy/docker-compose.yml | 3 +- deploy/local_certs/CA/rootCA.pem | 16 ---------- deploy/local_certs/certs/localhost.crt | 18 ----------- deploy/local_certs/certs/localhost.key | 27 ---------------- deploy/local_certs/localhost.csr | 15 --------- deploy/local_certs/localhost.ext | 9 ------ 9 files changed, 19 insertions(+), 133 deletions(-) create mode 100644 deploy/caddyfile delete mode 100644 deploy/local_certs/CA/rootCA.pem delete mode 100644 deploy/local_certs/certs/localhost.crt delete mode 100644 deploy/local_certs/certs/localhost.key delete mode 100644 deploy/local_certs/localhost.csr delete mode 100644 deploy/local_certs/localhost.ext diff --git a/Dockerfile b/Dockerfile index f464c9e07..7d6afd7f5 100644 --- a/Dockerfile +++ b/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 diff --git a/deploy-oss.sh b/deploy-oss.sh index 5b0176d9f..257af15ca 100755 --- a/deploy-oss.sh +++ b/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 < Caddyfile < .env < Date: Thu, 17 Jul 2025 16:15:31 +0300 Subject: [PATCH 2/9] reconfigure-local-caddy --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 7fa02aaf1..a76eb0419 100644 --- a/makefile +++ b/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) From f5e4a42d2dd2dfd6def594dd65e997e91c924c6c Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Thu, 17 Jul 2025 16:20:20 +0300 Subject: [PATCH 3/9] reconfigure-local-caddy --- backend/client/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/client/requirements.txt b/backend/client/requirements.txt index 20b3119cc..23bfa9e4c 100644 --- a/backend/client/requirements.txt +++ b/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,<4 typing_extensions>=4.11.0,<5 rfc3339-validator==0.1.4 # Used to validate date-time format in jsonschema packaging==23.0 \ No newline at end of file From ad1fd1b567418628baeacad77eb98a6db36f5761 Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Thu, 17 Jul 2025 16:21:39 +0300 Subject: [PATCH 4/9] reconfigure-local-caddy --- backend/client/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/client/requirements.txt b/backend/client/requirements.txt index 23bfa9e4c..159531200 100644 --- a/backend/client/requirements.txt +++ b/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,<4 +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 \ No newline at end of file From 02db72a3766bc5d60db2446be3675913004c0332 Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Thu, 17 Jul 2025 16:29:43 +0300 Subject: [PATCH 5/9] reconfigure-local-caddy --- liccheck.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/liccheck.ini b/liccheck.ini index fbc76c959..15d0294d5 100644 --- a/liccheck.ini +++ b/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) From b8654f7a3ebef3d687de272a85ed0514068e6ade Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Mon, 21 Jul 2025 11:48:33 +0300 Subject: [PATCH 6/9] more time --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index a76eb0419..347909595 100644 --- a/makefile +++ b/makefile @@ -315,7 +315,7 @@ docker: external-services-setup: @docker-compose -f $(E2E)/docker-compose.yml up -d - @sleep 2 + @sleep 20 env-setup: external-services-setup @docker run -d --env-file $(E2E)/.development.env -e IS_ON_PREM -e OAUTH_CLIENT_ID -e OAUTH_CLIENT_SECRET --network deepchecks -p 8000:8000 deepchecks-enterprise-testing start-test.sh From ef0fa87e2eb687ee4826500a75c05a7aa8ebd4fc Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Mon, 21 Jul 2025 11:50:36 +0300 Subject: [PATCH 7/9] kafka --- deploy/docker-compose.yml | 1 + makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index ce0ba03c8..e6863dfdd 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -92,6 +92,7 @@ services: - db - redis - casdoor + - kafka extra_hosts: - "$DOMAIN:10.5.0.20" networks: diff --git a/makefile b/makefile index 347909595..32395d791 100644 --- a/makefile +++ b/makefile @@ -315,7 +315,7 @@ docker: external-services-setup: @docker-compose -f $(E2E)/docker-compose.yml up -d - @sleep 20 + @sleep 5 env-setup: external-services-setup @docker run -d --env-file $(E2E)/.development.env -e IS_ON_PREM -e OAUTH_CLIENT_ID -e OAUTH_CLIENT_SECRET --network deepchecks -p 8000:8000 deepchecks-enterprise-testing start-test.sh From cb79db51a6732386ed4faa8e09750b6c611578d4 Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Mon, 21 Jul 2025 12:15:53 +0300 Subject: [PATCH 8/9] caddyname-fix --- deploy/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index e6863dfdd..5c5a8d031 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -167,7 +167,7 @@ services: - '443:443' - '8443:8443' volumes: - - ./monitoring/deploy/.caddyfile:/etc/caddy/Caddyfile + - ./monitoring/deploy/caddyfile:/etc/caddy/Caddyfile depends_on: - app networks: From 1bf6026c16bbc6cd304d1a55175ffee401247dd9 Mon Sep 17 00:00:00 2001 From: JKL98ISR Date: Mon, 21 Jul 2025 12:16:37 +0300 Subject: [PATCH 9/9] caddyname-fix --- deploy/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 5c5a8d031..b5fa2f143 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -115,6 +115,7 @@ services: - db - redis - casdoor + - kafka networks: default: ipv4_address: 10.5.0.5 @@ -135,6 +136,7 @@ services: - db - redis - casdoor + - kafka networks: default: ipv4_address: 10.5.0.4 @@ -155,6 +157,7 @@ services: - db - redis - casdoor + - kafka networks: default: ipv4_address: 10.5.0.3