From 72e296895b3f8d113cd16714f32757f9ea1c38a0 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Thu, 24 Jul 2025 22:08:54 -0400
Subject: [PATCH 1/3] Adding Umami service.

---
 docker-compose.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7686386c..53179868 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5824,6 +5824,56 @@ services:
         target: /var/lib/postgresql/data
         type: volume
         volume: {}
+  umami:
+    container_name: umami
+    depends_on:
+      umami-pg-db:
+        required: true
+        condition: service_healthy
+    environment:
+      DATABASE_URL: postgresql://umami:${UMAMI_PG_DB_PASSWORD}@umami-pg-db:5432/umami
+      DATABASE_TYPE: postgresql
+      APP_SECRET: ${UMAMI_APP_SECRET}
+    healthcheck:
+      test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    image: ghcr.io/umami-software/umami:postgresql-latest
+    init: true
+    labels:
+      homepage.group: Professional Services
+      homepage.name: Umami
+      homepage.href: https://analytics.${MY_TLD}
+      homepage.icon: umami.svg
+      homepage.description: Simple, fast, privacy-focused alternative to Google Analytics
+      swag: enable
+      swag_port: 3000
+      swag_proto: http
+      swag_url: analytics.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://analytics.${MY_TLD}
+      swag.uptime-kuma.monitor.interval: 300
+    ports:
+      - 17382:3000
+    restart: unless-stopped
+  umami-pg-db:
+    container_name: umami-pg-db
+    environment:
+      POSTGRES_DB: umami
+      POSTGRES_USER: umami
+      POSTGRES_PASSWORD: ${UMAMI_PG_DB_PASSWORD}
+    expose:
+      - 5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    image: postgres:15-alpine
+    volumes:
+      - umami-db-data:/var/lib/postgresql/data
+    restart: unless-stopped
   unmanic:
     container_name: unmanic
     environment:
@@ -6432,6 +6482,8 @@ volumes:
     name: sonarqube-temp
   tandoor-pg:
     name: tandoor-pg
+  umami-db-data:
+    name: umami-db-data
   unmanic-cache:
     name: unmanic-cache
   wallos-db:
-- 
2.52.0


From 54a95d5ab4b6249ace0dcf8ed8f1d9ef5e21e31c Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Thu, 24 Jul 2025 22:08:54 -0400
Subject: [PATCH 2/3] Adding Docker Health Check steps.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index dffaed67..81d6474e 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -367,12 +367,14 @@ jobs:
             ${{ needs.generate-service-list.outputs.svc_deploy_list }}
           up-flags: -d --remove-orphans
           down-flags: --dry-run
-      # - name: Check Services' Healthiness
-      #   uses: thegabriele97/dockercompose-health-action@main
-      #   with:
-      #     filename: 'docker-compose.yml'
-      #     timeout: '60'
-      #     workdir: '.'
+      - name: Docker Compoose Healthcheck
+        uses: jaracogmbh/docker-compose-health-check-action@v1.0.0
+        with:
+          max-retries: 5
+          retry-interval: 10
+          compose-file: "docker-compose.yml"
+          skip-exited: "true"
+          skip-no-healthcheck: "true"
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
-- 
2.52.0


From c4ceb76db7159ff75ec89025a9b237ced65140e4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <Trez.One@users.noreply.github.com>
Date: Fri, 25 Jul 2025 02:11:43 +0000
Subject: [PATCH 3/3] chore: Update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 9168c01b..cb2585c9 100644
--- a/README.md
+++ b/README.md
@@ -186,6 +186,8 @@
 | swag | lscr.io/linuxserver/swag:latest |
 | tandoor | vabene1111/recipes |
 | tandoor-pg | postgres:16-alpine |
+| umami | ghcr.io/umami-software/umami:postgresql-latest |
+| umami-pg-db | postgres:15-alpine |
 | unmanic | josh5/unmanic:latest |
 | uptimekuma | louislam/uptime-kuma:latest |
 | vault | hashicorp/vault:latest |
-- 
2.52.0