From 2fef031726ffe61b2dd245218c052065f7d87cb8 Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Sun, 28 Dec 2025 21:39:43 -0600
Subject: [PATCH] sd

---
 vikunja.yaml | 108 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 64 insertions(+), 44 deletions(-)

diff --git a/vikunja.yaml b/vikunja.yaml
index 382f336..70b5e38 100644
--- a/vikunja.yaml
+++ b/vikunja.yaml
@@ -1,74 +1,94 @@
 services:
   vikunja:
     image: vikunja/vikunja:latest
-    user: "1001:998"
-    environment:
-      VIKUNJA_SERVICE_PUBLICURL: https://task.netgrimoire.com
-      VIKUNJA_DATABASE_HOST: vikdb
-      VIKUNJA_DATABASE_PASSWORD: F@lcon13
-      VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
-      VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: vikunja
-    ports:
-      - "3456:3456"
-    volumes:
-      - /DockerVol/vikunja/files:/app/vikunja/files
-    depends_on:
-      - vikdb
-    restart: unless-stopped
     networks:
       - netgrimoire
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://192.168.5.17:12201"
-        tag: "vikunja"
+
+    environment:
+      TZ: America/Chicago
+      PUID: "1001"
+      PGID: "998"
+      VIKUNJA_SERVICE_PUBLICURL: "https://task.netgrimoire.com"
+      VIKUNJA_DATABASE_HOST: "vikdb"
+      VIKUNJA_DATABASE_PASSWORD: "F@lcon13"
+      VIKUNJA_DATABASE_TYPE: "mysql"
+      VIKUNJA_DATABASE_USER: "vikunja"
+      VIKUNJA_DATABASE_DATABASE: "vikunja"
+      VIKUNJA_SERVICE_JWTSECRET: "vikunja"
+
+    user: "1001:998"
+
+    ports:
+      - target: 3456
+        published: 3456
+        protocol: tcp
+        mode: ingress
+
+    volumes:
+      - /DockerVol/vikunja/files:/app/vikunja/files
+
     deploy:
+      placement:
+        constraints:
+          - node.hostname == docker4
+
       labels:
+        # Homepage
         homepage.group: "Application"
         homepage.name: "Vikunja"
         homepage.icon: "vikunja.png"
-        homepage.href: ""
+        homepage.href: "https://task.netgrimoire.com"
         homepage.description: "Task Manager"
+
+        # Kuma
         kuma.vik.http.name: "Vikunja"
         kuma.vik.http.url: "http://vikunja:3456"
+
+        # Caddy
         caddy: "task.netgrimoire.com"
         caddy.import: "authentik"
         caddy.reverse_proxy: "{{upstreams 3456}}"
-      placement:
-        constraints:
-          - node.hostname == docker4
+
+        # Diun (image update monitoring)
+        diun.enable: "true"
 
   vikdb:
     image: mariadb:10.6
-    user: "1001:998"
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-    environment:
-      MYSQL_ROOT_PASSWORD: F@lcon13
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: F@lcon13
-      MYSQL_DATABASE: vikunja
-    volumes:
-      - /DockerVol/vikunja/db:/var/lib/mysql
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $MYSQL_USER --password=$MYSQL_PASSWORD"]
-      interval: 2s
-
     networks:
       - netgrimoire
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://192.168.5.17:12201"
-        tag: "vikunja"
+
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+
+    environment:
+      TZ: America/Chicago
+      PUID: "1001"
+      PGID: "998"
+      MYSQL_ROOT_PASSWORD: "F@lcon13"
+      MYSQL_USER: "vikunja"
+      MYSQL_PASSWORD: "F@lcon13"
+      MYSQL_DATABASE: "vikunja"
+
+    user: "1001:998"
+
+    volumes:
+      - /DockerVol/vikunja/db:/var/lib/mysql
+
+    healthcheck:
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $MYSQL_USER --password=$MYSQL_PASSWORD"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
 
     deploy:
       placement:
         constraints:
           - node.hostname == docker4
 
+      labels:
+        # Diun (image update monitoring)
+        diun.enable: "true"
+
 networks:
   netgrimoire:
     external: true