Merge pull request #3751 from bluewave-labs/develop

develop -> master

.dockerignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/dist
-**/.env
-**/*.env
-.git
-docker/dev/mongo/data

.github/workflows/build-image.yml

@@ -1,103 +0,0 @@
-name: Build image
-
-on:
-  push:
-    branches: ["develop", "master"]
-    tags: ["v*"]
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # checkmate-backend-mono is a transitional alias so existing deployments
-      # keep receiving updates; drop it after one release cycle.
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/checkmate
-            ghcr.io/${{ github.repository_owner }}/checkmate-backend-mono
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
-
-      - name: Build and push multi-arch image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  # The hosted staging/prod instances share one host and one compose file; each
-  # deploy pulls and recreates only its own service.
-  deploy-staging:
-    needs: build-and-push
-    if: github.ref == 'refs/heads/develop'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy staging.checkmate.so
-        uses: appleboy/ssh-action@v1.2.2
-        with:
-          host: ${{ secrets.DEMO_SERVER_HOST }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
-          script: |
-            cd checkmate
-            git pull
-            cd docs/hosting/checkmate-so
-            docker compose pull checkmate-staging
-            docker compose up -d checkmate-staging
-            docker system prune -af
-
-  deploy-prod:
-    needs: build-and-push
-    if: github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy demo.checkmate.so
-        uses: appleboy/ssh-action@v1.2.2
-        with:
-          host: ${{ secrets.DEMO_SERVER_HOST }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
-          script: |
-            cd checkmate
-            git pull
-            cd docs/hosting/checkmate-so
-            docker compose pull checkmate-demo
-            docker compose up -d checkmate-demo
-            docker system prune -af

.github/workflows/deploy-images-on-release.yml

@@ -0,0 +1,148 @@
+name: Deploy images on release
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract version from tag
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-client:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Client Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-client:${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend:${{ steps.extract_tag.outputs.version }}
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server-mono-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/dist-arm/server.Dockerfile
+          push: true
+          no-cache: true
+          tags: |
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:${{ steps.extract_tag.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+          build-args: |
+            VITE_APP_VERSION=${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server-mono:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist-mono/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ steps.extract_tag.outputs.version }} \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }}

.github/workflows/deploy-images.yml

@@ -0,0 +1,143 @@
+name: Deploy images
+
+on:
+  push:
+    branches: ["master"]
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-client:latest \
+            -f ./docker/dist/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Client Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-client:latest
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend:latest \
+            -f ./docker/dist/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend:latest
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:latest \
+            -f ./docker/dist/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:latest
+
+  docker-build-and-push-server-mono-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/dist-arm/server.Dockerfile
+          push: true
+          no-cache: true
+          tags: |
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+          build-args: |
+            VITE_APP_VERSION=${{ env.VERSION }}
+
+  docker-build-and-push-server-mono:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:latest \
+            -f ./docker/dist-mono/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:latest

.github/workflows/production-deploy.yml

@@ -0,0 +1,91 @@
+name: Demo deploy
+
+on:
+  push:
+    branches: [ "demo" ]
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:frontend-demo \
+            -f ./docker/prod/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Client Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:frontend-demo
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:backend-demo \
+            -f ./docker/prod/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:backend-demo
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:mongo-demo \
+            -f ./docker/prod/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:mongo-demo
+
+  deploy-to-demo:
+    needs: docker-build-and-push-server
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH into server and restart container using Docker Compose
+        uses: appleboy/ssh-action@v1.2.2
+        with:
+          host: ${{ secrets.DEMO_SERVER_HOST }}
+          username: ${{ secrets.DEMO_SERVER_USER }}
+          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
+          script: |
+            cd checkmate
+            git pull
+            cd docker/unified
+            docker compose down
+            docker compose pull
+            docker compose up -d
+            docker system prune -af

.github/workflows/staging-deploy.yml

@@ -0,0 +1,91 @@
+name: Staging deploy
+
+on:
+  push:
+    branches: [ "develop" ]
+
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:frontend-staging \
+            -f ./docker/staging/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Client Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:frontend-staging
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:backend-staging \
+            -f ./docker/staging/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:backend-staging
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:mongo-staging \
+            -f ./docker/staging/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:mongo-staging
+
+  deploy-to-staging:
+    needs: docker-build-and-push-server
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH into server and restart container using Docker Compose
+        uses: appleboy/ssh-action@v1.2.2
+        with:
+          host: ${{ secrets.DEMO_SERVER_HOST }}
+          username: ${{ secrets.DEMO_SERVER_USER }}
+          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
+          script: |
+            cd checkmate
+            git pull
+            cd docker/unified
+            docker compose down
+            docker compose pull
+            docker compose up -d
+            docker system prune -af

CLAUDE.md

@@ -35,9 +35,9 @@ npm run format           # Prettier formatting
 
 ### Docker Development
 ```bash
-docker build -f docker/Dockerfile -t checkmate .          # build the mono image (server + built client)
+cd docker/dev
-docker compose -f docker/dev/docker-compose.yaml up       # local full stack (builds image, runs mongo + worker)
+./build_images.sh
-docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:8.0   # just a dev database
+docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:6.0
 ```
 
 ## Environment Setup
@@ -51,7 +51,6 @@ TOKEN_TTL="99d"
 ORIGIN="localhost"
 LOG_LEVEL="debug"
 ```
-Only `CLIENT_HOST` (must be a full URL), `JWT_SECRET`, and `DB_CONNECTION_STRING` are strictly required; the rest have defaults (see `server/src/config/envValidation.ts`). Setup source of truth: CONTRIBUTING.md.
 
 ### Client `.env`
 ```env

CONTRIBUTING.md

@@ -88,10 +88,34 @@ cd Checkmate
 
 #### Step 2: Set Up Docker Containers (MongoDB)
 
+Navigate to the Docker dev directory:
+
+```bash
+cd docker/dev
+```
+
+Build the Docker images:
+
+Linux:
+```bash
+./build_images.sh
+```
+
+Windows:
+```bash
+./build_images.bat
+```
+
 Run MongoDB container:
 
 ```bash
-docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:8.0
+docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:6.0
+```
+
+Navigate back to the root directory:
+
+```bash
+cd ../..
 ```
 
 #### Step 3: Set Up the Backend (Server)
@@ -124,12 +148,10 @@ LOG_LEVEL="debug"
 - `CLIENT_HOST`: Frontend URL (default: http://localhost:5173)
 - `JWT_SECRET`: Secret key for JWT tokens (change to something secure)
 - `DB_CONNECTION_STRING`: MongoDB connection URL
-- `ORIGIN`: Origin for CORS purposes (optional)
+- `ORIGIN`: Origin for CORS purposes
-- `TOKEN_TTL`: Token time to live in vercel/ms format (optional, default: `99d`)
+- `TOKEN_TTL`: Token time to live (in vercel/ms format)
-- `LOG_LEVEL`: Debug level: debug, info, warn, error (optional, default: `debug`)
+- `LOG_LEVEL`: Debug level (debug, info, warn, error)
-- `QUEUE_MODE`: Queue mode, `primary` or `worker` (optional, default: `primary`)
+- `QUEUE_TYPE`: Job queue implementation (`superSimpleQueue` or `lessSimpleQueue`, optional, default: `superSimpleQueue`)
-
-Only `CLIENT_HOST`, `JWT_SECRET`, and `DB_CONNECTION_STRING` are strictly required. Note that `CLIENT_HOST` must be a full URL.
 
 Start the backend server:
 
@@ -205,7 +227,7 @@ docker rm uptime_database_mongo
 
 **Port already in use:**
 
-- Check if another service is using ports 5173, 52345, or 27017
+- Check if another service is using ports 5173, 52345, 27017, or 6379
 - Stop the conflicting service or change the port in `.env` files
 
 **MongoDB connection issues:**
@@ -234,35 +256,6 @@ docker rm uptime_database_mongo
 
 Start with [good first issues](https://github.com/bluewave-labs/checkmate/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
 
-### Improve the documentation?
-
-Documentation contributions are very welcome — fixing a typo, clarifying a step, or adding a missing example is a valuable PR.
-
-- Small edits (typos, wording, formatting): open a PR directly against `develop`.
-- Larger changes (restructuring a section, adding a new guide): open an issue first so we can align on scope, then a PR.
-- Screenshots are helpful when documenting UI behaviour.
-- README translations live in `docs/translations/`. If you're adding a new language, please also add a flag + link to the language bar in the root `README.md` and every existing translated README so they stay in sync.
-
-### Help with translations?
-
-The application uses `i18next` with one JSON file per language under `client/src/locales/` (`en.json` is the source of truth). English source strings are the definitive copy; other languages are generated as one-time machine translations that anyone is welcome to refine.
-
-**To improve an existing language:**
-
-1. Edit the relevant `client/src/locales/<code>.json` file directly.
-2. Keep the JSON key structure identical to `en.json` — only translate the string values.
-3. Open a PR against `develop`. No language-selector code changes are needed.
-
-**To add a new language:**
-
-1. Add `client/src/locales/<code>.json` with the same key structure as `en.json`, translated. If you can't translate every key, leave unfamiliar strings in English rather than removing keys — i18next falls back to the key path when a value is missing.
-2. Add the display name to `languageNames` in `client/src/Components/inputs/LanguageSelector.tsx` (e.g. `it: "Italiano"`). The selector picks up any language present in `resources` automatically.
-3. Open a PR against `develop`.
-
-If translating a whole file is more than you want to take on, open an issue asking us to add the language and we'll generate an initial machine-translated file that you (or others) can refine over time.
-
-**Note:** an older workflow that synced translations with PoEditor is still in the repo but no longer authoritative. Please treat the `.json` files in `client/src/locales/` as the source of truth.
-
 ### Submit a pull request?
 
 Follow the [pull request checklist](#pull-request-checklist). Your PR should:

README.md

@@ -9,7 +9,6 @@
   🇪🇸 <a href="docs/translations/README.es.md">Español</a> |
   🇫🇮 <a href="docs/translations/README.fi.md">Suomi</a> |
   🇫🇷 <a href="docs/translations/README.fr.md">Français</a> |
-  🇮🇹 <a href="docs/translations/README.it.md">Italiano</a> |
   🇯🇵 <a href="docs/translations/README.ja.md">日本語</a> |
   🇧🇷 <a href="docs/translations/README.pt-BR.md">Português (Brasil)</a> |
   🇷🇺 <a href="docs/translations/README.ru.md">Русский</a> |
@@ -80,37 +79,7 @@ Usage instructions can be found [here](https://checkmate.so/docs).
 <a id="installation"></a>
 ## Installation
 
-The quickest way to run Checkmate is the reference Docker Compose file, which runs the all-in-one image (`ghcr.io/bluewave-labs/checkmate`) plus MongoDB:
+See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
-
-```bash
-curl -O https://raw.githubusercontent.com/bluewave-labs/checkmate/master/docker/docker-compose.yaml
-JWT_SECRET="$(openssl rand -hex 32)" docker compose up -d
-```
-
-Then open http://localhost:52345. If the app is reached at another origin (domain or LAN IP), set `CLIENT_HOST` accordingly. To build the image yourself, run `docker build -f docker/Dockerfile -t checkmate .` from a checkout. For TLS, put any reverse proxy (Caddy, Traefik, nginx) in front of port 52345.
-
-### Configuration
-
-The image is configured entirely through environment variables on the server container:
-
-| Variable | Required | Description |
-|---|---|---|
-| `DB_CONNECTION_STRING` | Yes | MongoDB connection string, e.g. `mongodb://mongodb:27017/uptime_db` |
-| `JWT_SECRET` | Yes | Secret used to sign auth tokens; generate one with `openssl rand -hex 32` |
-| `CLIENT_HOST` | Yes | The URL users reach the app at, e.g. `https://checkmate.example.com`; used for CORS and for links in notifications and emails |
-| `LOG_LEVEL` | No | Server log level: `error`, `warn`, `info`, or `debug` (default `debug`) |
-
-The web client needs no configuration by default: it calls the API on the same origin it was served from (`/api/v1`). For setups where the defaults don't apply — for example, the API is reached through a different origin than the page — the server renders overrides into the client at runtime via these optional variables:
-
-| Variable | Description |
-|---|---|
-| `CLIENT_CONFIG_API_BASE_URL` | Full base URL the client calls the API at, e.g. `https://api.example.com/api/v1`; defaults to same-origin `/api/v1` |
-| `CLIENT_CONFIG_CLIENT_HOST` | Origin used when the client builds absolute links (invites, status pages); defaults to the browser's current origin |
-| `CLIENT_CONFIG_LOG_LEVEL` | Browser console log level: `error`, `warn`, `info`, or `debug` (default `error`) |
-
-> **Upgrading from an older image?** The `UPTIME_APP_*` variables (`UPTIME_APP_API_BASE_URL`, `UPTIME_APP_CLIENT_HOST`, `UPTIME_APP_LOG_LEVEL`) are no longer read. In most setups no replacement is needed — the same-origin defaults cover them; if you pointed the client at a different origin, use the `CLIENT_CONFIG_*` equivalents above. The `checkmate-client`, `checkmate-backend`, `checkmate-mongo`, and `checkmate-backend-mono-multiarch` images are no longer updated — switch to `ghcr.io/bluewave-labs/checkmate`, keeping your existing MongoDB service and data volume.
-
-See full installation instructions in the [Checkmate documentation portal](https://checkmate.so/docs). 
 
 Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa), [Cloudzy](https://cloudzy.com/marketplace/checkmate) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
 

charts/helm/checkmate/Chart.yaml

@@ -3,8 +3,4 @@ name: checkmate-chart
 description: A Helm chart for Checkmate App
 type: application
 version: 0.2.0
-# DO NOT bump appVersion past v3.8.1 until this chart is migrated to the all-in-one
-# image (ghcr.io/bluewave-labs/checkmate). The checkmate-client / checkmate-backend /
-# checkmate-mongo images this chart references are frozen at v3.8.1 — later versions
-# are never published, so a bumped chart will fail to pull.
 appVersion: "v3.8.1" # "v" prefix: published image tags are v-prefixed (ghcr.io/.../checkmate-*:v3.8.1)

client/.env.production

@@ -1,6 +1,4 @@
-# Production builds use same-origin defaults: API at /api/v1, client host from
+VITE_APP_API_BASE_URL=UPTIME_APP_API_BASE_URL
-# window.location.origin. The empty values below override any local .env so a
+VITE_APP_API_V2_BASE_URL=UPTIME_APP_API_V2_BASE_URL
-# production build never bakes in a developer's localhost URLs.
+VITE_APP_CLIENT_HOST=UPTIME_APP_CLIENT_HOST
-VITE_APP_API_BASE_URL=
+VITE_APP_LOG_LEVEL=UPTIME_APP_LOG_LEVEL
-VITE_APP_CLIENT_HOST=
-VITE_APP_LOG_LEVEL=

client/.gitignore

@@ -28,4 +28,5 @@ dist-ssr
 
 # Scripts
 *.sh
+!env.sh
 .env.development

client/env.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+for i in $(env | grep UPTIME_APP_)
+do
+    key=$(echo $i | cut -d '=' -f 1)
+    value=$(echo $i | cut -d '=' -f 2-)
+    echo $key=$value
+    find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|${key}|${value}|g" '{}' +
+done

client/index.html

@@ -12,7 +12,6 @@
 		/>
 
 		<title>Checkmate</title>
-		<script src="/config.js"></script>
 	</head>
 
 	<body>

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "client",
 	"private": true,
-	"version": "3.9.2",
+	"version": "3.9.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -33,7 +33,7 @@
 		"html2canvas": "^1.4.1",
 		"human-interval": "2.0.1",
 		"i18next": "25.4.2",
-		"joi": "17.13.4",
+		"joi": "17.13.3",
 		"lucide-react": "^0.562.0",
 		"maplibre-gl": "^5.19.0",
 		"mui-color-input": "^7.0.0",

client/public/config.js

@@ -1,4 +0,0 @@
-// Fallback so /config.js always resolves (e.g. under the Vite dev server). In
-// the Docker image the server shadows this path and renders the real config
-// from its CLIENT_CONFIG_* environment variables.
-window.__CHECKMATE_CONFIG__ = {};

client/src/Components/inputs/LanguageSelector.tsx

@@ -13,9 +13,7 @@ export const languageNames: Record<string, string> = {
 	ca: "Català",
 	es: "Español",
 	fr: "Français",
-	it: "Italiano",
 	"pt-BR": "Português (BR)",
-	pl: "Polski",
 	cs: "Čeština",
 	fi: "Suomi",
 	tr: "Türkçe",

client/src/Components/monitors/charts/RadialAvgResponse.tsx

@@ -20,7 +20,7 @@ export const RadialAvgResponse = ({ avg, max }: { avg: number; max: number }) =>
 	const msg: Record<string, string> = {
 		success: "Excellent",
 		warning: "Average",
-		error: "Poor",
+		danger: "Poor",
 	};
 
 	return (

client/src/Pages/Account/components/InviteTeamMemberDialog.tsx

@@ -10,9 +10,8 @@ import { useInviteForm } from "@/Hooks/useInviteForm";
 import type { InviteFormData } from "@/Validation/invite";
 import { usePost } from "@/Hooks/UseApi";
 import { LAYOUT } from "@/Utils/Theme/constants";
-import { runtimeConfig } from "@/Utils/runtimeConfig";
 
-const CLIENT_HOST = runtimeConfig.clientHost || import.meta.env.VITE_APP_CLIENT_HOST;
+const CLIENT_HOST = import.meta.env.VITE_APP_CLIENT_HOST;
 
 interface InviteResponse {
 	token: string;
@@ -57,7 +56,7 @@ export const InviteTeamMemberDialog = ({
 		const result = await generateToken("/invite", data);
 		if (result?.data?.token) {
 			const token = result.data.token;
-			const link = `${CLIENT_HOST || window.location.origin}/register/${token}`;
+			const link = CLIENT_HOST ? `${CLIENT_HOST}/register/${token}` : token;
 			setInviteLink(link);
 		}
 	};

client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx

@@ -63,20 +63,10 @@ const getChartConfigs = (
 	return configs;
 };
 
-// Loopback / bridge names Capture sees when it can only observe the container's
+const hasAnyNetworkTraffic = (checks: HardwareCheckStats[]): boolean =>
-// own network namespace. When ALL reported interfaces match this set we assume
+	checks.some((c) =>
-// the "no real interfaces visible" case and surface the notice.
+		c.net?.some((iface) => iface.bytesSentPerSecond > 0 || iface.deltaBytesRecv > 0)
-const CONTAINER_ONLY_IFACE_NAMES = new Set(["lo", "lo0", "docker0"]);
+	);
-
-const onlyContainerVisibleInterfaces = (checks: HardwareCheckStats[]): boolean => {
-	const named = new Set<string>();
-	checks.forEach((c) => c.net?.forEach((iface) => named.add(iface.name)));
-	if (named.size === 0) return false;
-	for (const name of named) {
-		if (!CONTAINER_ONLY_IFACE_NAMES.has(name)) return false;
-	}
-	return true;
-};
 
 export const InfraNetworkCharts = ({
 	checks,
@@ -92,14 +82,13 @@ export const InfraNetworkCharts = ({
 		() => getChartConfigs(theme, checks, t),
 		[theme, checks, t]
 	);
-	const showLoopbackOnlyNotice =
+	const showNoTrafficNotice = chartConfigs.length > 0 && !hasAnyNetworkTraffic(checks);
-		chartConfigs.length > 0 && onlyContainerVisibleInterfaces(checks);
 
 	return (
 		<Stack gap={theme.spacing(LAYOUT.XS)}>
-			{showLoopbackOnlyNotice && (
+			{showNoTrafficNotice && (
 				<NoticeBanner severity="warning">
-					{t("pages.infrastructure.charts.labels.loopbackOnlyNotice")}
+					{t("pages.infrastructure.charts.labels.netNoTraffic")}
 				</NoticeBanner>
 			)}
 			<Grid

client/src/Pages/StatusPage/Status/index.tsx

@@ -21,7 +21,6 @@ import {
 	getStatusPagePublicUrl,
 	isCustomDomainHost,
 } from "@/Utils/statusPageUrl";
-import { cssReferencesExternalResource } from "@/Utils/customCss";
 import { HeaderStatusPageControls } from "@/Pages/StatusPage/Status/Components/HeaderStatusPageControls";
 import { StatusPageThemeProvider } from "@/Pages/StatusPage/Status/themes/StatusPageThemeProvider";
 import {
@@ -133,19 +132,13 @@ const StatusPageView = () => {
 	// Public route: render directly on the viewport, themed background covers everything.
 	if (isPublic) {
 		const themeConfig = THEME_CONFIGS[resolveStatusPageTheme(statusPage.theme)];
-		const customCss =
-			statusPage.customCSS && !cssReferencesExternalResource(statusPage.customCSS)
-				? statusPage.customCSS
-				: "";
 		return (
 			<StatusPageThemeProvider
 				theme={statusPage.theme}
 				themeMode={statusPage.themeMode}
 				timezone={statusPage.timezone}
-				brandColor={statusPage.color}
 				paintBody
 			>
-				{customCss && <style>{customCss}</style>}
 				<BaseStatusPage
 					statusPage={statusPage}
 					monitors={monitors}

client/src/Pages/StatusPage/Status/themes/StatusPageThemeProvider.tsx

@@ -6,7 +6,6 @@ import {
 	useState,
 	type ReactNode,
 } from "react";
-import { alpha, darken } from "@mui/material/styles";
 import {
 	DEFAULT_STATUS_PAGE_THEME,
 	resolveStatusPageTheme,
@@ -37,15 +36,6 @@ interface Props {
 	theme?: StatusPageTheme;
 	themeMode?: StatusPageThemeMode;
 	timezone?: string;
-	/**
-	 * Brand color picked in the status-page appearance settings. When
-	 * provided, it feeds `tokens.brand` / `brandStrong` / `brandSoft`,
-	 * which theme styles use for accent surfaces (hero, active tabs,
-	 * links). It does NOT recolor the semantic `up`/OK status color, so
-	 * a red or orange brand cannot make the "all operational" indicator
-	 * signal downtime.
-	 */
-	brandColor?: string;
 	/**
 	 * When true, paint the document body with the theme background so it
 	 * covers beyond the provider's wrapper (useful on the public route
@@ -64,32 +54,10 @@ interface Props {
 	children: ReactNode;
 }
 
-const HEX_COLOR = /^#([0-9a-f]{3}|[0-9a-f]{6})$/i;
-
-// Resolve the brand triple that theme styles read from. A customer's
-// picked color (when valid) overrides the theme's default; otherwise
-// the theme's own `brand*` values win, and finally we fall back to the
-// `up*` triple so unmigrated theme styles have something to consume.
-const resolveBrandTokens = (
-	tokens: StatusPageThemeTokens,
-	brandColor: string | undefined
-): StatusPageThemeTokens => {
-	const validOverride = brandColor && HEX_COLOR.test(brandColor) ? brandColor : undefined;
-	const brand = validOverride ?? tokens.brand ?? tokens.up;
-	const brandStrong = validOverride
-		? darken(validOverride, 0.2)
-		: (tokens.brandStrong ?? tokens.upStrong);
-	const brandSoft = validOverride
-		? alpha(validOverride, 0.15)
-		: (tokens.brandSoft ?? tokens.upSoft);
-	return { ...tokens, brand, brandStrong, brandSoft };
-};
-
 export const StatusPageThemeProvider = ({
 	theme,
 	themeMode,
 	timezone,
-	brandColor,
 	paintBody = false,
 	transparent = false,
 	children,
@@ -141,11 +109,7 @@ export const StatusPageThemeProvider = ({
 
 	const resolvedMode: ResolvedMode =
 		resolvedThemeMode === "auto" ? systemMode : resolvedThemeMode;
-	const baseTokens = themeTokens[resolvedTheme][resolvedMode];
+	const tokens = themeTokens[resolvedTheme][resolvedMode];
-	const tokens = useMemo(
-		() => resolveBrandTokens(baseTokens, brandColor),
-		[baseTokens, brandColor]
-	);
 
 	const value = useMemo(
 		() => ({

client/src/Pages/StatusPage/Status/themes/refined/styles.ts

@@ -119,7 +119,7 @@ export const refinedStyles = (
 			width: 28,
 			height: 28,
 			borderRadius: "8px",
-			background: tokens.brand,
+			background: tokens.up,
 			display: "grid",
 			placeItems: "center",
 			color: "#fff",
@@ -191,16 +191,16 @@ export const refinedStyles = (
 			whiteSpace: "nowrap",
 			textAlign: "center",
 			border: 0,
-			background: active ? tokens.brandSoft : "transparent",
+			background: active ? tokens.upSoft : "transparent",
 			fontFamily: "inherit",
 			fontSize: 11,
 			padding: { xs: "5px 6px", md: "5px 14px" },
 			cursor: "pointer",
-			color: active ? tokens.brand : tokens.textMuted,
+			color: active ? tokens.up : tokens.textMuted,
 			borderRadius: "5px",
 			transition: "background 0.15s ease, color 0.15s ease",
 			fontWeight: active ? 600 : 500,
-			"&:hover": { color: active ? tokens.brand : tokens.text },
+			"&:hover": { color: active ? tokens.up : tokens.text },
 		}),
 
 		monitorList: {
@@ -259,9 +259,9 @@ export const refinedStyles = (
 		},
 		pillHardware: {
 			...pillBase,
-			color: tokens.brand,
+			color: tokens.up,
 			border: `1px solid ${tokens.border}`,
-			background: tokens.brandSoft,
+			background: tokens.upSoft,
 		},
 		monitorUrl: {
 			fontSize: 12,
@@ -382,11 +382,11 @@ export const refinedStyles = (
 			fontSize: 12,
 			mt: "40px",
 			"& a": {
-				color: tokens.brand,
+				color: tokens.up,
 				textDecoration: "underline",
 				textUnderlineOffset: "3px",
 				fontWeight: 600,
-				"&:hover": { color: tokens.brandStrong },
+				"&:hover": { color: tokens.upStrong || tokens.up },
 			},
 		},
 	};

client/src/Pages/StatusPage/Status/themes/tokens.ts

@@ -9,14 +9,6 @@ export interface StatusPageThemeTokens {
 	up: string;
 	upStrong: string;
 	upSoft: string;
-	// Accent used for brand-tinted surfaces (hero background, active tab
-	// underline, "view all" links). Distinct from `up` so a red/orange
-	// brand color cannot recolor the semantic OK/up status indicators.
-	// Themes leave these undefined by default; the provider falls back
-	// to `up`/`upStrong`/`upSoft` so styles have a value to consume.
-	brand?: string;
-	brandStrong?: string;
-	brandSoft?: string;
 	degraded: string;
 	degradedSoft: string;
 	down: string;

client/src/Types/env.d.ts

@@ -3,8 +3,7 @@
 declare const __APP_VERSION__: string;
 
 interface ImportMetaEnv {
-	readonly VITE_APP_API_BASE_URL?: string;
+	readonly VITE_APP_API_V2_BASE_URL?: string;
-	readonly VITE_APP_CLIENT_HOST?: string;
 	readonly VITE_APP_LOG_LEVEL?: "debug" | "info" | "warn" | "error";
 }
 

client/src/Utils/ApiClient.ts

@@ -1,10 +1,8 @@
 import axios from "axios";
 import type { AxiosError } from "axios";
 import type { AxiosRequestConfig, AxiosResponse } from "axios";
-import { runtimeConfig } from "@/Utils/runtimeConfig";
 
-const BASE_URL =
+const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
-	runtimeConfig.apiBaseUrl || import.meta.env.VITE_APP_API_BASE_URL || "/api/v1";
 
 const api = axios.create({
 	baseURL: BASE_URL,

client/src/Utils/logger.ts

@@ -1,5 +1,4 @@
 import type { LogLevel } from "@/Types/Log";
-import { runtimeConfig } from "@/Utils/runtimeConfig";
 
 interface LogContext {
 	[key: string]: any;
@@ -26,8 +25,7 @@ interface ErrorLogData {
 	userAgent: string;
 }
 
-const configuredLevel: LogLevel =
+const configuredLevel: LogLevel = import.meta.env.VITE_APP_LOG_LEVEL || "error";
-	runtimeConfig.logLevel || import.meta.env.VITE_APP_LOG_LEVEL || "error";
 const configuredPriority = LOG_LEVEL_PRIORITY[configuredLevel];
 
 const shouldLog = (level: LogLevel): boolean => {

client/src/Utils/runtimeConfig.ts

@@ -1,18 +0,0 @@
-import type { LogLevel } from "@/Types/Log";
-
-// Served by GET /config.js (rendered from server env) or a static config.js
-// next to index.html; loaded before the bundle in index.html.
-export interface RuntimeConfig {
-	apiBaseUrl?: string;
-	clientHost?: string;
-	logLevel?: LogLevel;
-}
-
-declare global {
-	interface Window {
-		__CHECKMATE_CONFIG__?: RuntimeConfig;
-	}
-}
-
-export const runtimeConfig: RuntimeConfig =
-	(typeof window !== "undefined" && window.__CHECKMATE_CONFIG__) || {};

client/src/Utils/statusPageUrl.ts

@@ -1,9 +1,6 @@
 import { PUBLIC_STATUS_PAGE_PREFIX, type StatusPage } from "@/Types/StatusPage";
-import { runtimeConfig } from "@/Utils/runtimeConfig";
 
-const CLIENT_HOST =
+const CLIENT_HOST = import.meta.env.VITE_APP_CLIENT_HOST as string | undefined;
-	runtimeConfig.clientHost ||
-	(import.meta.env.VITE_APP_CLIENT_HOST as string | undefined);
 
 const getClientOriginProtocol = (): string => {
 	const source =

client/src/locales/en.json

@@ -844,7 +844,7 @@
 					"memory": "Memory usage",
 					"netBytesRecv": "{{name}} - Bytes Received",
 					"netBytesSent": "{{name}} - Bytes Sent",
-					"loopbackOnlyNotice": "Capture is only reporting loopback or container-bridge interfaces (lo, lo0, docker0). This is normal when Capture runs inside a container that can only see its own network namespace — run Capture directly on the host to see real network activity.",
+					"netNoTraffic": "Capture is reporting zero traffic on every interface. This is normal when Capture runs inside a container that can only see loopback interfaces — run Capture directly on the host to see real network activity.",
 					"temp": "Temp"
 				}
 			},

docker/coolify/build_images.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=bluewaveuptime/uptime_client
+set dockerfiles[0]=.\docker\coolify\client.Dockerfile
+
+set services[1]=bluewaveuptime/uptime_database_mongo
+set dockerfiles[1]=.\docker\coolify\mongoDB.Dockerfile
+
+set services[2]=bluewaveuptime/uptime_server
+set dockerfiles[2]=.\docker\coolify\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/coolify/build_images.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# Change directory to root Server directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../../
+
+# Define an array of services and their Dockerfiles
+declare -A services=(
+  ["bluewaveuptime/uptime_client"]="./docker/coolify/client.Dockerfile"
+  ["bluewaveuptime/uptime_database_mongo"]="./docker/coolify/mongoDB.Dockerfile"
+  ["bluewaveuptime/uptime_server"]="./docker/coolify/server.Dockerfile"
+)
+
+# Loop through each service and build the corresponding image
+for service in "${!services[@]}"; do
+  docker build -f "${services[$service]}" -t "$service" .
+  
+  # Check if the build succeeded
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/coolify/client.Dockerfile

@@ -0,0 +1,22 @@
+FROM node:20-slim AS build
+
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+WORKDIR /app
+
+COPY ./client/package*.json ./
+
+RUN npm install
+
+COPY ./client .
+
+RUN npm run build
+
+FROM nginx:1.27.1-alpine
+
+COPY ./server/docker/dist/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+
+CMD ["nginx", "-g", "daemon off;"]

docker/coolify/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/coolify/nginx/conf.d/default.conf

@@ -0,0 +1,35 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name checkmate-demo.bluewavelabs.ca;
+    server_tokens off;
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    location /api/ {
+        proxy_pass http://server:5000/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server:5000/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

docker/coolify/server.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY ../../package*.json ./
+
+RUN npm install
+
+COPY ../../ ./
+
+RUN npm run build
+
+EXPOSE 5000
+
+CMD ["node", "dist/index.js"]

docker/dev/build_images.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\dev\client.Dockerfile
+
+set services[1]=uptime_mongo
+set dockerfiles[1]=.\docker\dev\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\dev\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/dev/build_images.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Change directory to root Server directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../..
+
+# Define service names and their corresponding Dockerfiles in parallel arrays
+services=("uptime_client" "uptime_mongo" "uptime_server")
+dockerfiles=(
+  "./docker/dev/client.Dockerfile"
+  "./docker/dev/mongoDB.Dockerfile"
+  "./docker/dev/server.Dockerfile"
+)
+
+# Loop through each service and build the corresponding image
+for i in "${!services[@]}"; do
+  service="${services[$i]}"
+  dockerfile="${dockerfiles[$i]}"
+  
+  docker build -f "$dockerfile" -t "$service" .
+  
+  # Check if the build succeeded
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/dev/client.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim AS build
+
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+WORKDIR /app
+
+COPY ./client/package*.json ./
+
+RUN npm install
+
+COPY ./client ./
+
+RUN npm run build
+
+FROM nginx:1.27.1-alpine
+
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+CMD ["nginx", "-g", "daemon off;"]

docker/dev/docker-compose.custom-ca-example.yaml

@@ -1,14 +1,29 @@
 # Dev/Test only: Not required in production
 # Example Docker Compose configuration for custom CA trust
 # This file demonstrates how to configure Checkmate to trust custom CAs
-#
+# 
-# Usage: docker compose -f docker-compose.yaml -f docker-compose.custom-ca-example.yaml up
+# Usage: docker-compose -f docker-compose.yaml -f docker-compose.custom-ca-example.yaml up
 
 services:
-  checkmate:
+  server:
+    image: uptime_server:latest
+    restart: always
+    ports:
+      - "52345:52345"
+    env_file:
+      - server.env
     environment:
       # Mount your custom CA certificate
       NODE_EXTRA_CA_CERTS: /certs/custom-ca.pem
     volumes:
       # Mount the certs directory (read-only for security)
       - ./certs:/certs:ro
+    depends_on:
+      - mongodb
+    # Optional: Add healthcheck to ensure the server starts properly
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:52345/api/v1/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s

docker/dev/docker-compose.yaml

@@ -1,20 +1,27 @@
 services:
-  checkmate:
+  client:
-    build:
+    image: uptime_client:latest
-      context: ../..
+    restart: always
-      dockerfile: docker/Dockerfile
+    ports:
+      - "80:80"
+    environment:
+      UPTIME_APP_API_BASE_URL: "http://localhost:52345/api/v1"
+      UPTIME_APP_CLIENT_HOST: "http://localhost"
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d/
+    depends_on:
+      - server
+  server:
+    image: uptime_server:latest
     restart: always
     ports:
       - "52345:52345"
     env_file:
       - server.env
     depends_on:
-      mongodb:
+      - mongodb
-        condition: service_healthy
   worker:
-    build:
+    image: uptime_server:latest
-      context: ../..
-      dockerfile: docker/Dockerfile
     restart: always
     ports:
       - "52346:52346"
@@ -36,10 +43,9 @@ services:
       timeout: 3s
       retries: 3
     depends_on:
-      mongodb:
+      - mongodb
-        condition: service_healthy
   mongodb:
-    image: mongo:8.0
+    image: uptime_mongo:latest
     restart: always
     ports:
       - "27017:27017"

docker/dev/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/dev/nginx/conf.d/default.conf

@@ -0,0 +1,35 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    server_name localhost;      # Set server name to localhost
+    server_tokens off;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    # location /api/ {
+    #     proxy_pass http://server:52345/api/;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Host $host;
+    #     proxy_set_header X-Real-IP $remote_addr;
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     proxy_set_header X-Forwarded-Proto $scheme;
+    #     proxy_set_header Connection '';
+    #     chunked_transfer_encoding off;
+    #     proxy_buffering off;
+    #     proxy_cache off;
+    # }
+
+    # location /api-docs/ {
+    #     proxy_pass http://server:52345/api-docs/;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Host $host;
+    #     proxy_set_header X-Real-IP $remote_addr;
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     proxy_set_header X-Forwarded-Proto $scheme;
+    # }
+}

docker/dev/server.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY ./server/package*.json ./
+
+RUN npm install
+
+COPY ./server/ ./
+
+RUN npm run build
+
+EXPOSE 52345
+
+CMD ["node", "dist/index.js"]

docker/dist-arm/build_images.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e  # Exit on error
+
+# Change directory to root Server directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../..
+
+# Ensure buildx builder exists and is used
+if ! docker buildx inspect mybuilder &>/dev/null; then
+  docker buildx create --name mybuilder --use
+else
+  docker buildx use mybuilder
+fi
+
+# Define service names and Dockerfiles
+services=("mono_server_arm")
+dockerfiles=(
+  "./docker/dist-arm/server.Dockerfile"
+)
+
+# Static image name for GitHub Container Registry (GHCR)
+image="ghcr.io/bluewave-labs/checkmate:backend-dist-multi-arch"
+platforms="linux/amd64,linux/arm64"
+repo_url="https://github.com/bluewave-labs/checkmate"
+
+# Loop through each service and build
+for i in "${!services[@]}"; do
+  service="${services[$i]}"
+  dockerfile="${dockerfiles[$i]}"
+
+  echo "🚀 Building multi-arch image for $service..."
+  docker buildx build \
+    --platform "$platforms" \
+    -f "$dockerfile" \
+    -t "$image" \
+    --label "org.opencontainers.image.source=$repo_url" \
+    --push \
+    .
+
+  echo "✅ $image pushed for platforms: $platforms"
+done
+
+echo "🎉 All multi-arch images built and pushed successfully"

docker/dist-arm/docker-compose.yaml

@@ -0,0 +1,28 @@
+services:
+  server:
+    image: ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
+    restart: always
+    pull_policy: always
+    ports:
+      - "52345:52345"
+    environment:
+      - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1
+      - UPTIME_APP_CLIENT_HOST=http://localhost
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
+      - CLIENT_HOST=http://localhost
+      - JWT_SECRET=my_secret
+    depends_on:
+      - mongodb
+  mongodb:
+    image: mongo:6.0
+    restart: always
+    command: ["mongod", "--quiet", "--bind_ip_all"]
+    volumes:
+      - ./mongo/data:/data/db
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.runCommand({ ping: 1 })", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30

docker/dist-arm/server.Dockerfile

@@ -4,7 +4,7 @@
 # Build on the host arch (BUILDPLATFORM) rather than under QEMU — the output is
 # pure JS so it's arch-independent, and this avoids the esbuild host/native
 # binary version mismatch under emulation.
-FROM --platform=$BUILDPLATFORM node:22-slim AS frontend-build
+FROM --platform=$BUILDPLATFORM node:20-slim AS frontend-build
 
 WORKDIR /app/client
 
@@ -19,7 +19,7 @@ RUN npm run build
 # ---------------------
 # Backend stage
 # ---------------------
-FROM node:22-slim AS app
+FROM node:20-slim AS backend
 
 # Install ping
 RUN apt-get update \
@@ -28,18 +28,23 @@ RUN apt-get update \
 
 WORKDIR /app/server
 
-COPY server/package*.json ./
+COPY server/package.json ./
 
-RUN npm ci
+RUN npm install
 
 COPY server ./
 
+RUN chmod +x ./scripts/inject-vars.sh
+
 RUN npm run build
 
 COPY --from=frontend-build /app/client/dist ./public
 
-USER node
+RUN chown -R node:node ./public \
+    && chown -R node:node ./dist \
+    && chown -R node:node ./scripts
 
-EXPOSE 52345 52346
 
-CMD ["node", "dist/index.js"]
+EXPOSE 52345
+
+CMD ["sh", "-c", "./scripts/inject-vars.sh && node ./dist/index.js"]

docker/dist-mono/build_images.bat

@@ -0,0 +1,30 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_database_mongo
+set dockerfiles[0]=.\docker\dist-mono\mongoDB.Dockerfile
+
+set services[1]=uptime_server
+set dockerfiles[1]=.\docker\dist-mono\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/dist-mono/build_images.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Change directory to root Server directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../..
+
+# Define service names and their corresponding Dockerfiles in parallel arrays
+services=("mono_mongo"  "mono_server")
+dockerfiles=(
+  "./docker/dist-mono/mongoDB.Dockerfile"
+  "./docker/dist-mono/server.Dockerfile"
+)
+
+# Loop through each service and build the corresponding image
+for i in "${!services[@]}"; do
+  service="${services[$i]}"
+  dockerfile="${dockerfiles[$i]}"
+  
+  docker build -f "$dockerfile" -t "$service" .
+  
+  # Check if the build succeeded
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/dist-mono/docker-compose-local.yaml

@@ -0,0 +1,27 @@
+services:
+  server:
+    image: mono_server
+    restart: always
+    ports:
+      - "52345:52345"
+    environment:
+      - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1
+      - UPTIME_APP_CLIENT_HOST=http://localhost
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
+      - CLIENT_HOST=http://localhost
+      - JWT_SECRET=my_secret
+    depends_on:
+      - mongodb
+  mongodb:
+    image: mono_mongo
+    restart: always
+    command: ["mongod", "--quiet", "--bind_ip_all"]
+    volumes:
+      - ./mongo/data:/data/db
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30

docker/dist-mono/docker-compose.yaml

@@ -0,0 +1,28 @@
+services:
+  server:
+    image: ghcr.io/bluewave-labs/checkmate-backend-mono:latest
+    pull_policy: always
+    restart: always
+    ports:
+      - "52345:52345"
+    environment:
+      - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1
+      - UPTIME_APP_CLIENT_HOST=http://localhost
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
+      - CLIENT_HOST=http://localhost
+      - JWT_SECRET=my_secret
+    depends_on:
+      - mongodb
+  mongodb:
+    image: ghcr.io/bluewave-labs/checkmate-mongo:latest
+    restart: always
+    command: ["mongod", "--quiet", "--bind_ip_all"]
+    volumes:
+      - ./mongo/data:/data/db
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30

docker/dist-mono/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/dist-mono/server.Dockerfile

@@ -0,0 +1,37 @@
+FROM node:20-slim AS frontend-build
+
+WORKDIR /app/client
+
+COPY client/package*.json ./
+RUN npm install
+
+COPY client ./
+RUN npm run build
+
+FROM node:20-slim AS app
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app/server
+
+COPY server ./
+
+RUN npm install
+
+RUN npm run build
+RUN cp -r src/templates dist/templates
+
+COPY --from=frontend-build /app/client/dist ./public
+
+RUN chmod +x ./scripts/inject-vars.sh \
+    && chown -R node:node ./public \
+    && chown -R node:node ./dist \
+    && chown -R node:node ./scripts
+
+
+EXPOSE 52345
+
+CMD ["sh", "-c", "./scripts/inject-vars.sh && node ./dist/index.js"]

docker/dist/build_images.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=bluewaveuptime/uptime_client
+set dockerfiles[0]=.\docker\dist\client.Dockerfile
+
+set services[1]=bluewaveuptime/uptime_database_mongo
+set dockerfiles[1]=.\docker\dist\mongoDB.Dockerfile
+
+set services[2]=bluewaveuptime/uptime_server
+set dockerfiles[2]=.\docker\dist\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/dist/build_images.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Change directory to root Server directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../../
+
+# Define an array of services and their Dockerfiles
+declare -A services=(
+  ["bluewaveuptime/uptime_client"]="./docker/dist/client.Dockerfile"
+  ["bluewaveuptime/uptime_database_mongo"]="./docker/dist/mongoDB.Dockerfile"
+  ["bluewaveuptime/uptime_server"]="./docker/dist/server.Dockerfile"
+)
+
+for service in "${!services[@]}"; do
+  docker build \
+    -f "${services[$service]}" \
+    -t "$service" \
+    .
+
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/dist/client.Dockerfile

@@ -0,0 +1,22 @@
+FROM node:20-slim AS build
+
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+WORKDIR /app
+
+COPY ./client/package*.json ./
+
+RUN npm install
+
+COPY ./client .
+
+RUN npm run build
+
+FROM nginx:1.27.1-alpine
+
+COPY ./docker/dist/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+
+CMD ["nginx", "-g", "daemon off;"]

docker/dist/docker-compose.yaml

@@ -0,0 +1,38 @@
+services:
+  client:
+    image: ghcr.io/bluewave-labs/checkmate-client:latest
+    restart: always
+    environment:
+      UPTIME_APP_API_BASE_URL: "http://localhost:52345/api/v1"
+      UPTIME_APP_CLIENT_HOST: "http://localhost"
+    ports:
+      - "80:80"
+      - "443:443"
+    depends_on:
+      - server
+  server:
+    image: ghcr.io/bluewave-labs/checkmate-backend:latest
+    restart: always
+    ports:
+      - "52345:52345"
+    depends_on:
+      - mongodb
+    environment:
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
+      - CLIENT_HOST=http://localhost
+      - JWT_SECRET=my_secret
+    # volumes:
+    # - /var/run/docker.sock:/var/run/docker.sock:ro
+  mongodb:
+    image: ghcr.io/bluewave-labs/checkmate-mongo:latest
+    restart: always
+    volumes:
+      - ./mongo/data:/data/db
+    command: ["mongod", "--quiet", "--bind_ip_all"]
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30

docker/dist/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/dist/nginx/conf.d/default.conf

@@ -0,0 +1,35 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name checkmate-demo.bluewavelabs.ca;
+    server_tokens off;
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    # location /api/ {
+    #     proxy_pass http://server:5000/api/;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Host $host;
+    #     proxy_set_header X-Real-IP $remote_addr;
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     proxy_set_header X-Forwarded-Proto $scheme;
+    # }
+
+    location /api-docs/ {
+        proxy_pass http://server:5000/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

docker/dist/server.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY ./server/package*.json ./
+
+RUN npm install
+
+COPY ./server/ ./
+
+RUN npm run build
+
+EXPOSE 52345
+
+CMD ["node", "dist/index.js"]

docker/docker-compose.yaml

@@ -1,45 +0,0 @@
-services:
-  checkmate:
-    image: ghcr.io/bluewave-labs/checkmate:latest
-    pull_policy: always
-    restart: always
-    ports:
-      - "52345:52345"
-    environment:
-      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
-      - CLIENT_HOST=${CLIENT_HOST:-http://localhost:52345}
-      - JWT_SECRET=${JWT_SECRET:?set JWT_SECRET in your environment}
-    stop_grace_period: 60s
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "require('http').get('http://localhost:52346/livez',r=>process.exit(r.statusCode===200?0:1)).on('error',()=>process.exit(1))",
-        ]
-      interval: 15s
-      timeout: 3s
-      start_period: 60s
-      start_interval: 2s
-      retries: 3
-    depends_on:
-      mongodb:
-        condition: service_healthy
-
-  mongodb:
-    image: mongo:8.0
-    restart: always
-    command: ["mongod", "--quiet", "--bind_ip_all"]
-    volumes:
-      - mongo-data:/data/db
-    healthcheck:
-      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-volumes:
-  mongo-data:

docker/prod/build_images.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\prod\client.Dockerfile
+
+set services[1]=uptime_database_mongo
+set dockerfiles[1]=.\docker\prod\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\prod\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/prod/build_images.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Change directory to root directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../../
+
+# Define an array of services and their Dockerfiles
+declare -A services=(
+  ["uptime_client"]="./docker/prod/client.Dockerfile"
+  ["uptime_database_mongo"]="./docker/prod/mongoDB.Dockerfile"
+  ["uptime_server"]="./docker/prod/server.Dockerfile"
+)
+
+# Loop through each service and build the corresponding image
+for service in "${!services[@]}"; do
+  docker build -f "${services[$service]}" -t "$service" .
+  
+  # Check if the build succeeded
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/prod/client.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim AS build
+
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+WORKDIR /app
+
+COPY ./client/package*.json ./
+
+RUN npm install
+
+COPY ./client .
+
+RUN npm run build
+
+FROM nginx:1.27.1-alpine
+
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+CMD ["nginx", "-g", "daemon off;"]

docker/prod/docker-compose.yaml

@@ -0,0 +1,53 @@
+services:
+  client:
+    image: ghcr.io/bluewave-labs/checkmate:frontend-demo
+    restart: always
+    environment:
+      UPTIME_APP_API_BASE_URL: "https://demo.checkmate.so/api/v1"
+      UPTIME_APP_CLIENT_HOST: "https://demo.checkmate.so"
+    ports:
+      - "80:80"
+      - "443:443"
+    depends_on:
+      - server
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d/:ro
+      - /etc/letsencrypt:/etc/nginx/ssl:ro
+
+  server:
+    image: ghcr.io/bluewave-labs/checkmate:backend-demo
+    restart: always
+    ports:
+      - "52345:52345"
+    env_file:
+      - server.env
+    depends_on:
+      - mongodb
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+  mongodb:
+    image: ghcr.io/bluewave-labs/checkmate:mongo-demo
+    restart: always
+    command: ["mongod", "--quiet", "--bind_ip_all"]
+    volumes:
+      - ./mongo/data:/data/db
+    env_file:
+      - mongo.env
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
+  capture:
+    image: ghcr.io/bluewave-labs/capture:latest
+    container_name: capture
+    restart: unless-stopped
+    ports:
+      - "59232:59232"
+    environment:
+      - API_SECRET=my_secret
+      - GIN_MODE=release
+    volumes:
+      - /etc/os-release:/etc/os-release:ro

docker/prod/mongo/init/init.js

@@ -0,0 +1,41 @@
+function initiateReplicaSet() {
+  try {
+    rs.initiate({
+      _id: "rs0",
+      members: [{ _id: 0, host: "localhost:27017" }],
+    });
+  } catch (e) {
+    print("Replica set already initiated or error occurred: " + e);
+  }
+}
+
+function waitForPrimary() {
+  while (true) {
+    const isMaster = db.isMaster();
+    if (isMaster.ismaster) {
+      print("This node is now PRIMARY.");
+      break;
+    }
+    print("Waiting to become PRIMARY...");
+    sleep(2000);
+  }
+}
+
+function createUser() {
+  db = db.getSiblingDB("uptime_db");
+
+  var username = process.env.USERNAME_ENV_VAR;
+  var password = process.env.PASSWORD_ENV_VAR;
+
+  db.createUser({
+    user: username,
+    pwd: password,
+    roles: [{ role: "readWrite", db: "uptime_db" }],
+  });
+
+  print("User '" + username + "' created successfully");
+}
+
+initiateReplicaSet();
+waitForPrimary();
+createUser();

docker/prod/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/prod/nginx/conf.d/cerbot

@@ -0,0 +1,15 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name checkmate-demo.bluewavelabs.ca www.checkmate-demo.bluewavelabs.ca;
+    server_tokens off;
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+    location / {
+        return 301 https://[domain-name]$request_uri;
+    }
+}

docker/prod/nginx/conf.d/default.conf

@@ -0,0 +1,69 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name checkmate-demo.bluewavelabs.ca;
+    server_tokens off;
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    location /api/ {
+        proxy_pass http://server:52345/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server:52345/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
+
+server {
+    listen 443 default_server ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name checkmate-demo.bluewavelabs.ca;
+
+    ssl_certificate /etc/nginx/ssl/live/demo.checkmate.so/fullchain.pem;
+    ssl_certificate_key /etc/nginx/ssl/live/demo.checkmate.so/privkey.pem;
+    
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api/ {
+        proxy_pass http://server:52345/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server:52345/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

docker/prod/server.Dockerfile

@@ -0,0 +1,24 @@
+FROM node:20-slim
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV NODE_OPTIONS="--max-old-space-size=2048"
+
+WORKDIR /app
+
+COPY ./server/package*.json ./
+
+RUN npm install
+
+COPY ./server ./
+
+RUN npm run build
+
+RUN cp -r src/templates dist/templates
+
+EXPOSE 52345
+
+CMD ["node", "dist/index.js"]

docker/staging/build_images.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\staging\client.Dockerfile
+
+set services[1]=uptime_database_mongo
+set dockerfiles[1]=.\docker\staging\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\staging\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/staging/build_images.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Change directory to root directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../../
+
+# Define an array of services and their Dockerfiles
+declare -A services=(
+  ["uptime_client"]="./docker/staging/client.Dockerfile"
+  ["uptime_database_mongo"]="./docker/staging/mongoDB.Dockerfile"
+  ["uptime_server"]="./docker/staging/server.Dockerfile"
+)
+
+# Loop through each service and build the corresponding image
+for service in "${!services[@]}"; do
+  docker build -f "${services[$service]}" -t "$service" .
+  
+  # Check if the build succeeded
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/staging/cerbot-compose.yaml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+  webserver:
+    image: nginx:latest
+    ports:
+      - 80:80
+      - 443:443
+    restart: always
+    volumes:
+      - ./nginx/conf.d/:/etc/nginx/conf.d/:ro
+      - ./certbot/www/:/var/www/certbot/:ro
+  certbot:
+    image: certbot/certbot:latest
+    volumes:
+      - ./certbot/www/:/var/www/certbot/:rw
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    depends_on:
+      - webserver

docker/staging/client.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim AS build
+
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+WORKDIR /app
+
+COPY ./client/package*.json ./
+
+RUN npm install
+
+COPY ./client ./
+
+RUN npm run build
+
+FROM nginx:1.27.1-alpine
+
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+CMD ["nginx", "-g", "daemon off;"]

docker/staging/docker-compose.yaml

@@ -0,0 +1,62 @@
+services:
+  client:
+    image: ghcr.io/bluewave-labs/checkmate:frontend-staging
+    restart: always
+    environment:
+      UPTIME_APP_API_BASE_URL: "https://checkmate-test.bluewavelabs.ca/api/v1"
+      UPTIME_APP_CLIENT_HOST: "https://checkmate-test.bluewavelabs.ca"
+    ports:
+      - "80:80"
+      - "443:443"
+    depends_on:
+      - server
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d/:ro
+      - ./certbot/www:/var/www/certbot/:ro
+      - ./certbot/conf/:/etc/nginx/ssl/:ro
+
+  certbot:
+    image: certbot/certbot:latest
+    restart: always
+    volumes:
+      - ./certbot/www/:/var/www/certbot/:rw
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew --webroot -w /var/www/certbot; sleep 12h & wait $${!}; done;'"
+
+  server:
+    image: ghcr.io/bluewave-labs/checkmate:backend-staging
+    restart: always
+    ports:
+      - "52345:52345"
+    env_file:
+      - server.env
+    depends_on:
+      - mongodb
+  mongodb:
+    image: ghcr.io/bluewave-labs/checkmate:mongo-staging
+    restart: always
+    command: ["mongod", "--quiet", "--bind_ip_all"]
+    ports:
+      - "27017:27017"
+    volumes:
+      - ./mongo/data:/data/db
+    env_file:
+      - mongo.env
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
+  capture:
+    image: ghcr.io/bluewave-labs/capture:latest
+    container_name: capture
+    restart: unless-stopped
+    ports:
+      - "59232:59232"
+    environment:
+      - API_SECRET=my_secret
+      - GIN_MODE=release
+    volumes:
+      - /etc/os-release:/etc/os-release:ro

docker/staging/mongo/init/01_init_replica_set.js

@@ -0,0 +1,15 @@
+try {
+  const status = rs.status();
+  printjson(status);
+} catch (e) {
+  if (e.codeName === "NotYetInitialized") {
+    print("Replica set not initialized. Initiating...");
+    rs.initiate({
+      _id: "rs0",
+      members: [{ _id: 0, host: "mongodb:27017" }],
+    });
+  } else {
+    print("Unexpected error during rs.status():");
+    printjson(e);
+  }
+}

docker/staging/mongo/init/02_create_users.js

@@ -0,0 +1,16 @@
+var username = process.env.USERNAME_ENV_VAR;
+var password = process.env.PASSWORD_ENV_VAR;
+
+db = db.getSiblingDB("uptime_db");
+
+db.createUser({
+	user: username,
+	pwd: password,
+	roles: [
+		{
+			role: "readWrite",
+			db: "uptime_db",
+		},
+	],
+});
+print("User uptime_user created successfully");

docker/staging/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/staging/nginx/conf.d/certbot

@@ -0,0 +1,15 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name checkmate-test.bluewavelabs.ca www.checkmate-test.bluewavelabs.ca;
+    server_tokens off;
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+    location / {
+        return 301 https://[domain-name]$request_uri;
+    }
+}

docker/staging/nginx/conf.d/default.conf

@@ -0,0 +1,77 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name checkmate-test.bluewavelabs.ca;
+    server_tokens off;
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    location /api/ {
+        proxy_pass http://server:52345/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Connection '';
+        chunked_transfer_encoding off;
+        proxy_buffering off;
+        proxy_cache off;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server:52345/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
+
+server {
+    listen 443 default_server ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name checkmate-test.bluewavelabs.ca;
+
+    ssl_certificate /etc/nginx/ssl/live/checkmate-test.bluewavelabs.ca/fullchain.pem;
+    ssl_certificate_key /etc/nginx/ssl/live/checkmate-test.bluewavelabs.ca/privkey.pem;
+    
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api/ {
+        proxy_pass http://server:52345/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Connection '';
+        chunked_transfer_encoding off;
+        proxy_buffering off;
+        proxy_cache off;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server:52345/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

docker/staging/server.Dockerfile

@@ -0,0 +1,24 @@
+FROM node:20-slim
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV NODE_OPTIONS="--max-old-space-size=2048"
+
+WORKDIR /app
+
+COPY ./server/package*.json ./
+
+RUN npm install
+
+COPY ./server ./
+
+RUN npm run build
+
+RUN cp -r src/templates dist/templates
+
+EXPOSE 52345
+
+CMD ["node", "dist/index.js"]

docker/unified/build_images.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\unified\client.Dockerfile
+
+set services[1]=uptime_database_mongo
+set dockerfiles[1]=.\docker\unified\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\unified\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0

docker/unified/build_images.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Change directory to root directory for correct Docker Context
+cd "$(dirname "$0")"
+cd ../../
+
+# Define an array of services and their Dockerfiles
+declare -A services=(
+  ["uptime_client"]="./docker/unified/client.Dockerfile"
+  ["uptime_database_mongo"]="./docker/unified/mongoDB.Dockerfile"
+  ["uptime_server"]="./docker/unified/server.Dockerfile"
+)
+
+# Loop through each service and build the corresponding image
+for service in "${!services[@]}"; do
+  docker build -f "${services[$service]}" -t "$service" .
+  
+  # Check if the build succeeded
+  if [ $? -ne 0 ]; then
+    echo "Error building $service image. Exiting..."
+    exit 1
+  fi
+done
+
+echo "All images built successfully"

docker/unified/certbot-compose.yaml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+  webserver:
+    image: nginx:latest
+    ports:
+      - 80:80
+      - 443:443
+    restart: always
+    volumes:
+      - ./nginx/conf.d/:/etc/nginx/conf.d/:ro
+      - ./certbot/www/:/var/www/certbot/:ro
+  certbot:
+    image: certbot/certbot:latest
+    volumes:
+      - ./certbot/www/:/var/www/certbot/:rw
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    depends_on:
+      - webserver

docker/unified/client.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-slim AS build
+
+ENV NODE_OPTIONS="--max-old-space-size=4096"
+
+WORKDIR /app
+
+COPY ./client/package*.json ./
+
+RUN npm install
+
+COPY ./client .
+
+RUN npm run build
+
+FROM nginx:1.27.1-alpine
+
+COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+CMD ["nginx", "-g", "daemon off;"]

docker/unified/docker-compose.yaml

@@ -0,0 +1,114 @@
+# sudo certbot certonly --standalone --http-01-port 8080
+# cerbot needs to run on 8080 since port 80 is used by the gateway
+
+services:
+  # Gateway (Single Entry Point)
+  gateway:
+    image: nginx:1.27.1-alpine
+    container_name: checkmate-gateway
+    restart: always
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /etc/letsencrypt:/etc/nginx/ssl:ro
+      - ./gateway/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+
+  # Production Stack ----- 
+  client-prod:
+    image: ghcr.io/bluewave-labs/checkmate:frontend-demo
+    container_name: client-prod
+    restart: always
+    environment:
+      UPTIME_APP_API_BASE_URL: "https://demo.checkmate.so/api/v1"
+      UPTIME_APP_CLIENT_HOST: "https://demo.checkmate.so"
+    expose:
+      - "80"
+    depends_on:
+      - server-prod
+    volumes:
+      - ./nginx/conf.d/prod.conf:/etc/nginx/conf.d/default.conf:ro
+
+  server-prod:
+    image: ghcr.io/bluewave-labs/checkmate:backend-demo
+    container_name: server-prod
+    restart: always
+    env_file:
+      - server-prod.env
+    depends_on:
+      - mongodb-prod
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+
+  mongodb-prod:
+    image: ghcr.io/bluewave-labs/checkmate:mongo-demo
+    container_name: mongodb-prod
+    restart: always
+    command: [ "mongod", "--quiet", "--bind_ip_all" ]
+    volumes:
+      - ./mongo/data-prod:/data/db
+    env_file:
+      - mongo-prod.env
+    healthcheck:
+      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet" ]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
+
+  # Staging Stack -----
+  client-staging:
+    image: ghcr.io/bluewave-labs/checkmate:frontend-staging
+    container_name: client-staging
+    restart: always
+    environment:
+      UPTIME_APP_API_BASE_URL: "https://staging.checkmate.so/api/v1"
+      UPTIME_APP_CLIENT_HOST: "https://staging.checkmate.so"
+    expose:
+      - "80"
+    depends_on:
+      - server-staging
+    volumes:
+      - ./nginx/conf.d/staging.conf:/etc/nginx/conf.d/default.conf:ro
+
+  server-staging:
+    image: ghcr.io/bluewave-labs/checkmate:backend-staging
+    container_name: server-staging
+    restart: always
+    env_file:
+      - server-staging.env
+    depends_on:
+      - mongodb-staging
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+
+  mongodb-staging:
+    image: ghcr.io/bluewave-labs/checkmate:mongo-staging
+    container_name: mongodb-staging
+    restart: always
+    command: [ "mongod", "--quiet", "--bind_ip_all" ]
+    volumes:
+      - ./mongo/data-staging:/data/db
+    env_file:
+      - mongo-staging.env
+    healthcheck:
+      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet" ]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
+
+  # Shared Utils
+  capture:
+    image: ghcr.io/bluewave-labs/capture:latest
+    container_name: capture
+    restart: unless-stopped
+    ports:
+      - "59232:59232"
+    environment:
+      - API_SECRET=my_secret
+      - GIN_MODE=release
+    volumes:
+      - /etc/os-release:/etc/os-release:ro

docker/unified/gateway/nginx.conf

@@ -19,7 +19,7 @@ server {
 }
 
 
-# --- DEMO: demo.checkmate.so ---
+# --- PRODUCTION: demo.checkmate.so ---
 server {
     listen 443 ssl;
     server_name demo.checkmate.so;
@@ -31,24 +31,25 @@ server {
     ssl_ciphers         HIGH:!aNULL:!MD5;
 
     location / {
-        # The mono image serves both the SPA and the API
+        # Passes traffic to the prod client on port 80
-        proxy_pass http://checkmate-demo:52345;
+        proxy_pass http://client-prod:80;
     }
 }
 
 # --- STAGING: staging.checkmate.so ---
-server {
-    listen 443 ssl;
-    server_name staging.checkmate.so;
 
-    ssl_certificate     /etc/nginx/ssl/live/staging.checkmate.so/fullchain.pem;
+ server {
-    ssl_certificate_key /etc/nginx/ssl/live/staging.checkmate.so/privkey.pem;
+     listen 443 ssl;
+     server_name staging.checkmate.so;
 
-    ssl_protocols       TLSv1.2 TLSv1.3;
+     ssl_certificate     /etc/nginx/ssl/live/staging.checkmate.so/fullchain.pem;
-    ssl_ciphers         HIGH:!aNULL:!MD5;
+     ssl_certificate_key /etc/nginx/ssl/live/staging.checkmate.so/privkey.pem;
 
-    location / {
+     ssl_protocols       TLSv1.2 TLSv1.3;
-        # The mono image serves both the SPA and the API
+     ssl_ciphers         HIGH:!aNULL:!MD5;
-        proxy_pass http://checkmate-staging:52345;
+
-    }
+     location / {
-}
+         # Passes traffic to the staging client on port 80
+         proxy_pass http://client-staging:80;
+     }
+ }

docker/unified/mongoDB.Dockerfile

@@ -0,0 +1,3 @@
+FROM mongo
+EXPOSE 27017
+CMD ["mongod"]

docker/unified/nginx/conf.d/prod.conf

@@ -0,0 +1,31 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name _; 
+    server_tokens off;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    location /api/ {
+        proxy_pass http://server-prod:52345/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server-prod:52345/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

docker/unified/nginx/conf.d/staging.conf

@@ -0,0 +1,31 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name _; 
+    server_tokens off;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+    
+    location /api/ {
+        proxy_pass http://server-staging:52345/api/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /api-docs/ {
+        proxy_pass http://server-staging:52345/api-docs/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

docker/unified/server.Dockerfile

@@ -0,0 +1,22 @@
+FROM node:20-slim
+
+# Install ping
+RUN apt-get update \
+    && apt-get install -y iputils-ping \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV NODE_OPTIONS="--max-old-space-size=2048"
+
+WORKDIR /app
+
+COPY ./server/package*.json ./
+
+RUN npm install
+
+COPY ./server ./
+
+RUN npm run build
+
+EXPOSE 52345
+
+CMD ["node", "dist/index.js"]

docs/README.md

@@ -19,6 +19,8 @@ If you need to monitor internal HTTPS endpoints with certificates from private C
 ### Example Configurations
 The `docker/dev/` directory contains example configurations:
 - `docker-compose.custom-ca-example.yaml` - Example Docker Compose with custom CA
+- `server-custom-ca.Dockerfile` - Example Dockerfile for OS-level CA trust
+- `export-smallstep-ca.sh` - Helper script for Smallstep CA export
 
 ## Contributing to Documentation
 

docs/custom-ca-trust.md

@@ -18,8 +18,8 @@ Add a volume mount for your CA certificate and set the environment variable:
 
 ```yaml
 services:
-  checkmate:
+  server:
-    image: ghcr.io/bluewave-labs/checkmate:latest
+    image: uptime_server:latest
     restart: always
     ports:
       - "52345:52345"
@@ -30,6 +30,7 @@ services:
     volumes:
       - ./certs:/certs:ro
     depends_on:
+      - redis
       - mongodb
 ```
 
@@ -51,53 +52,67 @@ For more comprehensive trust configuration, you can create a derived Dockerfile
 
 ### Custom Dockerfile
 
-Create `checkmate-custom-ca.Dockerfile`:
+Create `docker/dev/server-custom-ca.Dockerfile`:
 
 ```dockerfile
-FROM ghcr.io/bluewave-labs/checkmate:latest
+FROM node:20-alpine
 
-USER root
+# Install ca-certificates for Alpine
+RUN apk add --no-cache ca-certificates
 
-RUN apt-get update \
+WORKDIR /app
-    && apt-get install -y ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
 
-# Copy your custom CA certificate (must have a .crt extension)
+COPY ./server/package*.json ./
+
+RUN npm install
+
+COPY ./server/ ./
+
+# Copy your custom CA certificate
 COPY ./certs/custom-ca.crt /usr/local/share/ca-certificates/
 
 # Update CA certificates
 RUN update-ca-certificates
 
-USER node
+EXPOSE 52345
 
-# Node uses its bundled CA store by default; make it read the system store
+CMD ["node", "src/index.js"]
-ENV NODE_OPTIONS="--use-system-ca"
 ```
 
 ### Docker Compose Override
 
-Create `docker-compose.custom-ca.yaml`:
+Create `docker/dev/docker-compose.custom-ca.yaml`:
 
 ```yaml
 services:
-  checkmate:
+  server:
     build:
       context: .
-      dockerfile: checkmate-custom-ca.Dockerfile
+      dockerfile: server-custom-ca.Dockerfile
     restart: always
     ports:
       - "52345:52345"
     env_file:
       - server.env
     depends_on:
+      - redis
       - mongodb
 ```
 
-Run with: `docker compose -f docker-compose.yaml -f docker-compose.custom-ca.yaml up`
+Run with: `docker-compose -f docker-compose.yaml -f docker-compose.custom-ca.yaml up`
 
-## Base Image Considerations
+## Alpine Linux Considerations
 
-The Checkmate image is Debian-based (`node:22-slim`), which does not ship the `ca-certificates` package — install it before running `update-ca-certificates` (see the Dockerfile above). Certificates dropped into `/usr/local/share/ca-certificates/` must have a `.crt` extension, and Node only consults the system store when started with `--use-system-ca`. For most setups the `NODE_EXTRA_CA_CERTS` compose approach is simpler.
+Since Checkmate uses Alpine Linux as the base image, you need to install the `ca-certificates` package:
+
+```dockerfile
+# Install ca-certificates for Alpine
+RUN apk add --no-cache ca-certificates
+
+# Copy and update CA certificates
+COPY ./certs/custom-ca.crt /usr/local/share/ca-certificates/
+RUN update-ca-certificates
+```
 
 ## Smallstep CA Configuration
 

docs/hosting/checkmate-so/README.md

@@ -1,56 +0,0 @@
-# checkmate.so hosting (demo + staging)
-
-Config for BlueWave's hosted instances at `demo.checkmate.so` and
-`staging.checkmate.so`: one host, one nginx gateway terminating TLS, two
-independent Checkmate stacks running the mono image
-(`ghcr.io/bluewave-labs/checkmate`), plus a shared
-[Capture](https://github.com/bluewave-labs/capture) agent. It replaces the old
-`docker/unified/` setup (nginx client images + separate backend images + a
-republished Mongo image) and doubles as a worked example of running the mono
-image behind a TLS reverse proxy.
-
-## How deploys work
-
-`.github/workflows/build-image.yml` builds and pushes the image, then SSHes in
-and runs `docker compose pull <service> && docker compose up -d <service>` in
-this directory:
-
-- merge to `develop` → image tagged `:develop` → `checkmate-staging` recreated
-- merge to `master` → image tagged `:master` → `checkmate-demo` (prod) recreated
-
-The host keeps a git checkout of this repo (on `develop`); the deploy does
-`git pull` first so compose changes land with the code. Note the deploy only
-recreates the checkmate service — changes to `gateway/nginx.conf` or the mongo
-services need a manual `docker compose up -d` / gateway restart on the host.
-
-## Host-local files (not committed)
-
-Kept next to this compose file on the host:
-
-- `server-prod.env` / `server-staging.env` — Checkmate server env
-  (`DB_CONNECTION_STRING`, `JWT_SECRET`, `CLIENT_HOST=https://demo.checkmate.so`
-  etc.). The old `UPTIME_APP_*` client vars are no-ops now and can be removed;
-  if a client override is ever needed, use the `CLIENT_CONFIG_*` vars (see the
-  Configuration section of the root README).
-- `mongo-prod.env` / `mongo-staging.env` — Mongo credentials.
-- `mongo/data-prod` / `mongo/data-staging` — Mongo data directories.
-
-TLS certs live in `/etc/letsencrypt` (see `certbot-compose.yaml`; certbot
-answers ACME challenges on port 8080 behind the gateway).
-
-## One-time migration from docker/unified
-
-1. `cd ~/checkmate && git pull` (must be on a branch containing this directory).
-2. Stop the old stack: `cd docker/unified && docker compose down`.
-3. Move host-local files here:
-   `mv docker/unified/{server-prod.env,server-staging.env,mongo-prod.env,mongo-staging.env} docs/hosting/checkmate-so/`
-   `mv docker/unified/mongo docs/hosting/checkmate-so/mongo`
-4. **Check the Mongo data version before first start.** The old
-   `checkmate:mongo-*` images were built `FROM mongo` (floating latest), so the
-   data files follow whatever version was current at their last image build. Run
-   `db.adminCommand({ getParameter: 1, featureCompatibilityVersion: 1 })`
-   against the old container first and make the compose's `mongo:` tag match
-   (checked 2026-07-09: both stacks report FCV 8.2, hence the `mongo:8.2` pin
-   here). A lower pin than the data's FCV will refuse to start; a higher one
-   should step up one release at a time.
-5. `cd docs/hosting/checkmate-so && docker compose up -d`.

docs/hosting/checkmate-so/docker-compose.yaml

@@ -1,122 +0,0 @@
-# BlueWave's hosted demo + staging instances: one nginx gateway terminating TLS
-# in front of two independent Checkmate stacks, both running the mono image
-# (ghcr.io/bluewave-labs/checkmate). Doubles as a worked example of putting a
-# TLS proxy in front of the image.
-#
-# Deployed by .github/workflows/build-image.yml (deploy-staging / deploy-demo
-# jobs). Env files (server-prod.env, server-staging.env, mongo-prod.env,
-# mongo-staging.env) live on the host next to this file and are not committed.
-
-services:
-  # Gateway (single entry point)
-  gateway:
-    image: nginx:1.27.1-alpine
-    container_name: checkmate-gateway
-    restart: always
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /etc/letsencrypt:/etc/nginx/ssl:ro
-      - ./gateway/nginx.conf:/etc/nginx/conf.d/default.conf:ro
-
-  # Prod: demo.checkmate.so -----
-  checkmate-demo:
-    image: ghcr.io/bluewave-labs/checkmate:master
-    container_name: checkmate-demo
-    restart: always
-    env_file:
-      - server-prod.env
-    stop_grace_period: 60s
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "require('http').get('http://localhost:52346/livez',r=>process.exit(r.statusCode===200?0:1)).on('error',()=>process.exit(1))",
-        ]
-      interval: 15s
-      timeout: 3s
-      start_period: 60s
-      start_interval: 2s
-      retries: 3
-    depends_on:
-      mongodb-prod:
-        condition: service_healthy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  mongodb-prod:
-    image: mongo:8.2
-    container_name: mongodb-prod
-    restart: always
-    command: ["mongod", "--quiet", "--bind_ip_all"]
-    volumes:
-      - ./mongo/data-prod:/data/db
-    env_file:
-      - mongo-prod.env
-    healthcheck:
-      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-  # Staging: staging.checkmate.so -----
-  checkmate-staging:
-    image: ghcr.io/bluewave-labs/checkmate:develop
-    container_name: checkmate-staging
-    restart: always
-    env_file:
-      - server-staging.env
-    stop_grace_period: 60s
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "require('http').get('http://localhost:52346/livez',r=>process.exit(r.statusCode===200?0:1)).on('error',()=>process.exit(1))",
-        ]
-      interval: 15s
-      timeout: 3s
-      start_period: 60s
-      start_interval: 2s
-      retries: 3
-    depends_on:
-      mongodb-staging:
-        condition: service_healthy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  mongodb-staging:
-    image: mongo:8.2
-    container_name: mongodb-staging
-    restart: always
-    command: ["mongod", "--quiet", "--bind_ip_all"]
-    volumes:
-      - ./mongo/data-staging:/data/db
-    env_file:
-      - mongo-staging.env
-    healthcheck:
-      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-  # Shared utils
-  capture:
-    image: ghcr.io/bluewave-labs/capture:latest
-    container_name: capture
-    restart: unless-stopped
-    ports:
-      - "59232:59232"
-    environment:
-      - API_SECRET=my_secret
-      - GIN_MODE=release
-    volumes:
-      - /etc/os-release:/etc/os-release:ro

docs/translations/README.ar.md

@@ -11,7 +11,6 @@
   🇪🇸 <a href="README.es.md">Español</a> |
   🇫🇮 <a href="README.fi.md">Suomi</a> |
   🇫🇷 <a href="README.fr.md">Français</a> |
-  🇮🇹 <a href="README.it.md">Italiano</a> |
   🇯🇵 <a href="README.ja.md">日本語</a> |
   🇧🇷 <a href="README.pt-BR.md">Português (Brasil)</a> |
   🇷🇺 <a href="README.ru.md">Русский</a> |
@@ -87,7 +86,7 @@
 
 اطّلع على تعليمات التثبيت في [بوابة وثائق Checkmate](https://checkmate.so/docs).
 
-بدلاً من ذلك، يمكنك استخدام [Coolify](https://coolify.io/)، أو [Elestio](https://elest.io/open-source/checkmate)، أو [K8s](../../charts/helm/checkmate/INSTALLATION.md)، أو [Sive Host](https://sive.host) (جنوب أفريقيا)، أو [Cloudzy](https://cloudzy.com/marketplace/checkmate)، أو [Pikapods](https://www.pikapods.com/) لتشغيل نسخة من Checkmate بسرعة. إن أردت مراقبة البنية التحتية لخوادمك، ستحتاج إلى [وكيل Capture](https://github.com/bluewave-labs/capture). يحتوي مستودع Capture أيضًا على تعليمات التثبيت.
+بدلاً من ذلك، يمكنك استخدام [Coolify](https://coolify.io/)، أو [Elestio](https://elest.io/open-source/checkmate)، أو [K8s](./charts/helm/checkmate/INSTALLATION.md)، أو [Sive Host](https://sive.host) (جنوب أفريقيا)، أو [Cloudzy](https://cloudzy.com/marketplace/checkmate)، أو [Pikapods](https://www.pikapods.com/) لتشغيل نسخة من Checkmate بسرعة. إن أردت مراقبة البنية التحتية لخوادمك، ستحتاج إلى [وكيل Capture](https://github.com/bluewave-labs/capture). يحتوي مستودع Capture أيضًا على تعليمات التثبيت.
 
 ### استخدام شهادة CA مخصصة