From b1cb7f626cefda42e98dc1ad2a5599c8cd7f9a3f Mon Sep 17 00:00:00 2001 From: Mohab Gabber Date: Sat, 29 Mar 2025 16:55:31 +0200 Subject: [PATCH 01/10] fix: checkmate template network issues and env vars for emails --- blueprints/checkmate/docker-compose.yml | 38 ++++++++++++++++--------- blueprints/checkmate/template.yml | 6 +++- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/blueprints/checkmate/docker-compose.yml b/blueprints/checkmate/docker-compose.yml index 7a5fc89..2d1c811 100644 --- a/blueprints/checkmate/docker-compose.yml +++ b/blueprints/checkmate/docker-compose.yml @@ -4,39 +4,49 @@ services: restart: always environment: UPTIME_APP_API_BASE_URL: "http://${DOMAIN}/api/v1" - ports: - - 80 - - 443 depends_on: - server + networks: + - dbNet + - dokploy-network server: image: bluewaveuptime/uptime_server:latest restart: always - ports: - - 5000 depends_on: - redis - mongodb environment: - - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db - - REDIS_HOST=redis - + - DB_CONNECTION_STRING=mongodb://checkmate-mongodb:27017/uptime_db + - REDIS_HOST=checkmate-redis + - SYSTEM_EMAIL_HOST=${EMAIL_HOST} + - SYSTEM_EMAIL_PORT=${EMAIL_PORT} + - SYSTEM_EMAIL_ADDRESS=${EMAIL_ADDRESS} + - SYSTEM_EMAIL_PASSWORD=${EMAIL_PASSWORD} # volumes: - # - /var/run/docker.sock:/var/run/docker.sock:ro + # - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - dbNet + redis: image: bluewaveuptime/uptime_redis:latest restart: always - ports: - - 6379 + hostname: checkmate-redis volumes: - ../files/redis/data:/data - + networks: + - dbNet + mongodb: image: bluewaveuptime/uptime_database_mongo:latest restart: always + hostname: checkmate-mongodb volumes: - ../files/mongo/data:/data/db command: ["mongod", "--quiet"] - ports: - - 27017 + networks: + - dbNet + +networks: + dokploy-network: + dbNet: \ No newline at end of file diff --git a/blueprints/checkmate/template.yml b/blueprints/checkmate/template.yml index fb9b720..5dcf86f 100644 --- a/blueprints/checkmate/template.yml +++ b/blueprints/checkmate/template.yml @@ -9,5 +9,9 @@ config: env: - DOMAIN=${main_domain} + - EMAIL_PASSWORD= + - EMAIL_ADDRESS= + - EMAIL_PORT= + - EMAIL_HOST= - mounts: [] \ No newline at end of file + mounts: [] From bc156c6ddfef007c1c2d39be7e1211647f17a24b Mon Sep 17 00:00:00 2001 From: Mohab Gabber Date: Thu, 3 Apr 2025 15:01:42 +0200 Subject: [PATCH 02/10] fix: update docker-compose to use HTTPS and remove unused networks --- blueprints/checkmate/docker-compose.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/blueprints/checkmate/docker-compose.yml b/blueprints/checkmate/docker-compose.yml index 2d1c811..c0bcabd 100644 --- a/blueprints/checkmate/docker-compose.yml +++ b/blueprints/checkmate/docker-compose.yml @@ -3,12 +3,9 @@ services: image: bluewaveuptime/uptime_client:latest restart: always environment: - UPTIME_APP_API_BASE_URL: "http://${DOMAIN}/api/v1" + UPTIME_APP_API_BASE_URL: "https://${DOMAIN}/api/v1" depends_on: - server - networks: - - dbNet - - dokploy-network server: image: bluewaveuptime/uptime_server:latest @@ -25,8 +22,6 @@ services: - SYSTEM_EMAIL_PASSWORD=${EMAIL_PASSWORD} # volumes: # - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - dbNet redis: image: bluewaveuptime/uptime_redis:latest @@ -34,8 +29,6 @@ services: hostname: checkmate-redis volumes: - ../files/redis/data:/data - networks: - - dbNet mongodb: image: bluewaveuptime/uptime_database_mongo:latest @@ -44,9 +37,3 @@ services: volumes: - ../files/mongo/data:/data/db command: ["mongod", "--quiet"] - networks: - - dbNet - -networks: - dokploy-network: - dbNet: \ No newline at end of file From 6a0b3b6644c569753c6e1b90d678172c432eb220 Mon Sep 17 00:00:00 2001 From: Jonathan Gotti Date: Mon, 7 Apr 2025 02:09:02 +0200 Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=94=A7=20Update=20ports=20to=20matc?= =?UTF-8?q?h=20latest=20adguard=20dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blueprints/adguardhome/docker-compose.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/blueprints/adguardhome/docker-compose.yml b/blueprints/adguardhome/docker-compose.yml index a27c828..72b5be3 100644 --- a/blueprints/adguardhome/docker-compose.yml +++ b/blueprints/adguardhome/docker-compose.yml @@ -4,18 +4,17 @@ services: image: adguard/adguardhome:latest restart: unless-stopped ports: - - "53:53/tcp" - - "53:53/udp" - - "784:784/udp" - - "853:853/tcp" - - "853:853/udp" - - "8853:8853/udp" - - "5443:5443/tcp" - - "5443:5443/udp" + - "53:53/tcp" # DNS + - "53:53/udp" # DNS + - "67:67/udp" # DHCP Server + - "68:68/tcp" # DHCP Client + - "853:853/tcp" # DNS over TLS, DNS-over-QUIC + - "853:853/udp" # DNS over TLS, DNS-over-QUIC + - "6060:6060/tcp" # HTTP (pprof) volumes: - adguardhome-work:/opt/adguardhome/work - adguardhome-conf:/opt/adguardhome/conf volumes: adguardhome-work: {} - adguardhome-conf: {} \ No newline at end of file + adguardhome-conf: {} \ No newline at end of file From 3ab1c39b1a420324028bd7e1edca061250844bfe Mon Sep 17 00:00:00 2001 From: scanash00 Date: Sun, 6 Apr 2025 23:30:16 -0800 Subject: [PATCH 04/10] fix: plane template --- blueprints/plane/template.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 932af51..2a93dbf 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -17,8 +17,8 @@ env = [ "MINIO_ROOT_USER=access-key", "MINIO_ROOT_PASSWORD=password:32", "AWS_REGION=", -"AWS_ACCESS_KEY_ID={username}", -"AWS_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD}", +"AWS_ACCESS_KEY_ID=${MINIO_ROOT_USER}", +"AWS_SECRET_ACCESS_KEY=${minio_password}", "AWS_S3_ENDPOINT_URL=http://plane-minio:9000", "AWS_S3_BUCKET_NAME=uploads", "NGINX_PORT=80", From 8e79d293191329e7f14fc9b7b2f2140c1bcebbcb Mon Sep 17 00:00:00 2001 From: naterfute Date: Sun, 6 Apr 2025 00:33:12 -0700 Subject: [PATCH 05/10] fix: actual random values --- blueprints/plane/template.toml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 2a93dbf..bf42720 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -1,13 +1,19 @@ [variables] main_domain = "${domain}" +db_password = "${password:32}" +minio_password = "${password:32}" +rabbitmq_user = "${username}" +rabbitmq_pass = "${password:32}" +secret_key = "${base64:48}" [config] env = [ "Domain=${main_domain}", +"WEB_URL=${main_domain}", "PGHOST=plane-db", "PGDATABASE=plane", -"POSTGRES_USER={username}", -"POSTGRES_PASSWORD={password:32}", +"POSTGRES_USER=${username}", +"POSTGRES_PASSWORD=${db_password}", "POSTGRES_DB=plane", "POSTGRES_PORT=5432", "PGDATA=/var/lib/postgresql/data", @@ -15,7 +21,7 @@ env = [ "REDIS_PORT=6379", "REDIS_URL=redis://plane-redis:6379/", "MINIO_ROOT_USER=access-key", -"MINIO_ROOT_PASSWORD=password:32", +"MINIO_ROOT_PASSWORD=${minio_password}", "AWS_REGION=", "AWS_ACCESS_KEY_ID=${MINIO_ROOT_USER}", "AWS_SECRET_ACCESS_KEY=${minio_password}", @@ -26,12 +32,11 @@ env = [ "FILE_SIZE_LIMIT=5242880", "RABBITMQ_HOST=plane-mq", "RABBITMQ_PORT=5672", -"RABBITMQ_DEFAULT_USER={username}", -"RABBITMQ_DEFAULT_PASS={password:32}", +"RABBITMQ_DEFAULT_USER=rabbitmq_user", +"RABBITMQ_DEFAULT_PASS=${rabbitmq_pass}", "RABBITMQ_DEFAULT_VHOST=plane", "RABBITMQ_VHOST=plane", "API_BASE_URL=http://api:8000", -"WEB_URL=${main_domain}", "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", @@ -39,7 +44,7 @@ env = [ "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", -"SECRET_KEY={base64:48}", +"SECRET_KEY=${secret_key}", "AMQP_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@plane-mq:5672/plane", "API_KEY_RATE_LIMIT=60/minute", "MINIO_ENDPOINT_SSL=0" From a66149baaaf96950095bf6228d304999fa3776f2 Mon Sep 17 00:00:00 2001 From: naterfute Date: Mon, 7 Apr 2025 00:56:08 -0700 Subject: [PATCH 06/10] fix: cors error --- blueprints/plane/template.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index bf42720..858e7c8 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -8,8 +8,8 @@ secret_key = "${base64:48}" [config] env = [ -"Domain=${main_domain}", -"WEB_URL=${main_domain}", +"Domain=${host}", +"WEB_URL=${host}", "PGHOST=plane-db", "PGDATABASE=plane", "POSTGRES_USER=${username}", @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=", +"CORS_ALLOWED_ORIGINS=%{host}%", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From b3bb43d4ac3ee919fdee547268439513c1812a28 Mon Sep 17 00:00:00 2001 From: naterfute Date: Mon, 7 Apr 2025 01:22:37 -0700 Subject: [PATCH 07/10] fix: it's $ not %% --- blueprints/plane/template.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 858e7c8..25cb877 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -8,8 +8,8 @@ secret_key = "${base64:48}" [config] env = [ -"Domain=${host}", -"WEB_URL=${host}", +"Domain=${main_domain}", +"WEB_URL=${main_domain}", "PGHOST=plane-db", "PGDATABASE=plane", "POSTGRES_USER=${username}", @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=%{host}%", +"CORS_ALLOWED_ORIGINS=${main_domain}", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From d6015f77f0831a5daf557c360f86305890820e76 Mon Sep 17 00:00:00 2001 From: naterfute Date: Mon, 7 Apr 2025 01:34:13 -0700 Subject: [PATCH 08/10] fix: I kinda hate the templating system --- blueprints/plane/template.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 25cb877..9e67f39 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -8,8 +8,8 @@ secret_key = "${base64:48}" [config] env = [ -"Domain=${main_domain}", -"WEB_URL=${main_domain}", +"Domain=${domain}", +"WEB_URL=${Domain}", "PGHOST=plane-db", "PGDATABASE=plane", "POSTGRES_USER=${username}", @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=${main_domain}", +"CORS_ALLOWED_ORIGINS=${Domain}", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From 7e1a136c34cb59d3797e1840462671b694f9afb1 Mon Sep 17 00:00:00 2001 From: naterfute Date: Tue, 8 Apr 2025 10:36:25 -0700 Subject: [PATCH 09/10] fix: CORS_ALLOWED_ORIGINS not being https --- blueprints/plane/template.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml index 9e67f39..a12f456 100644 --- a/blueprints/plane/template.toml +++ b/blueprints/plane/template.toml @@ -40,7 +40,7 @@ env = [ "DEBUG=0", "SENTRY_DSN=", "SENTRY_ENVIRONMENT=production", -"CORS_ALLOWED_ORIGINS=${Domain}", +"CORS_ALLOWED_ORIGINS=https://${Domain}", "GUNICORN_WORKERS=1", "USE_MINIO=1", "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane", From 1e40cb493fde6c3062fbc8f75a79a049158ba914 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:28:32 -0600 Subject: [PATCH 10/10] Update template.toml --- blueprints/lowcoder/template.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/lowcoder/template.toml b/blueprints/lowcoder/template.toml index be1cc7a..189c084 100644 --- a/blueprints/lowcoder/template.toml +++ b/blueprints/lowcoder/template.toml @@ -5,7 +5,7 @@ encryption_salt = "${password:32}" api_secret = "${password:32}" [config] -[config.domains] +[[config.domains]] serviceName = "lowcoder-api-service" port = 3000 host = "${main_domain}"