From 615cad9a78df1531af4658b84b31d5fbb4469c6b Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Sat, 27 Dec 2025 16:40:29 -0600
Subject: [PATCH] mn,

---
 forgejo.yaml | 62 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/forgejo.yaml b/forgejo.yaml
index 3516927..37c6e82 100755
--- a/forgejo.yaml
+++ b/forgejo.yaml
@@ -1,37 +1,57 @@
-
 services:
-  forjejo:
+  forgejo:
     image: codeberg.org/forgejo/forgejo:11
-    container_name: forgejo
-    environment:
-      - USER_UID=1001
-      - USER_GID=998
-    restart: always
     networks:
       - netgrimoire
+
+    environment:
+      USER_UID: "1001"
+      USER_GID: "998"
+      TZ: America/Chicago
+
+    # Match your standard UID:GID execution model
+    #user: "1001:998"
+
     volumes:
       - /DockerVol/forgejo:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+
     ports:
-      - '3024:3000'
-      - '222:22'
+      - target: 3000
+        published: 3024
+        protocol: tcp
+        mode: ingress
+      - target: 22
+        published: 222
+        protocol: tcp
+        mode: ingress
+
     deploy:
-      labels:
-        - homepage.group=Application
-        - homepage.name=Forgejo
-        - homepage.icon=forgejo.png
-        - homepage.href=https://git.netgrimoire.com
-        - homepage.description=Git Repository
-        - kuma.git.http.name="Forgejo"
-        - kuma.git.http.url=http://forjejo:3000
-        - caddy=git.netgrimoire.com
-       # - caddy.import=authentik
-        - caddy.reverse_proxy="{{upstreams 3000}}"
       placement:
         constraints:
           - node.hostname == docker2
 
+      labels:
+        # Homepage
+        homepage.group: "Applications"
+        homepage.name: "Forgejo"
+        homepage.icon: "forgejo.png"
+        homepage.href: "https://git.netgrimoire.com"
+        homepage.description: "Git Repository"
+
+        # Kuma
+        kuma.git.http.name: "Forgejo"
+        kuma.git.http.url: "http://forgejo:3000"
+
+        # Caddy
+        caddy: "git.netgrimoire.com"
+        # caddy.import: "authentik"
+        caddy.reverse_proxy: "forgejo:3000"
+
+        # Diun (image update monitoring)
+        diun.enable: "true"
+
 networks:
   netgrimoire:
-    external: true 
+    external: true