From b1cb7f626cefda42e98dc1ad2a5599c8cd7f9a3f Mon Sep 17 00:00:00 2001
From: Mohab Gabber <mohabgabber0@gmail.com>
Date: Sat, 29 Mar 2025 16:55:31 +0200
Subject: [PATCH 1/2] 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 <mohabgabber0@gmail.com>
Date: Thu, 3 Apr 2025 15:01:42 +0200
Subject: [PATCH 2/2] 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