From 5d2e28dd9916639abec5110ff47663f39ab7ee25 Mon Sep 17 00:00:00 2001
From: KV-Tube Deployer <deploy@kv-tube.local>
Date: Sat, 28 Mar 2026 15:54:13 +0700
Subject: [PATCH] merge: combine forgejo into main docker-compose

---
 docker-compose.forgejo.yml | 54 --------------------------------------
 docker-compose.yml         | 52 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 54 deletions(-)
 delete mode 100644 docker-compose.forgejo.yml

diff --git a/docker-compose.forgejo.yml b/docker-compose.forgejo.yml
deleted file mode 100644
index 9ef435e..0000000
--- a/docker-compose.forgejo.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-services:
-  server:
-    image: codeberg.org/forgejo/forgejo:9
-    container_name: forgejo
-    environment:
-      - USER_UID=1026
-      - USER_GID=100
-      - GITEA__database__DB_TYPE=sqlite3
-      - TZ=Asia/Ho_Chi_Minh
-      - GITEA__actions__ENABLED=true
-      - INSTALL_LOCK=true
-    restart: always
-    networks:
-      - forgejo_custom_net
-    volumes:
-      - ./data:/data
-    ports:
-      - "3050:3000"
-      - "2222:22"
-
-  runner:
-    image: code.forgejo.org/forgejo/runner:latest
-    container_name: forgejo_runner
-    restart: always
-    user: "0:0"
-    privileged: true
-    depends_on:
-      - server
-    networks:
-      - forgejo_custom_net
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./runner-data:/data
-    entrypoint: 
-      - sh
-      - -c
-      - |
-        if [ ! -f /data/.runner ]; then
-          forgejo-runner register --no-interactive \
-            --instance http://server:3000 \
-            --token d5XKhmpu4lTR7P516juCjEes6QsI4qFvVean3zqT \
-            --name synology-runner \
-            --labels ubuntu-latest,ubuntu-22.04,docker:host
-        fi
-        forgejo-runner daemon
-    environment:
-      - TZ=Asia/Ho_Chi_Minh
-      
-networks:
-  forgejo_custom_net:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.38.0.0/24
diff --git a/docker-compose.yml b/docker-compose.yml
index b3ac6d5..5470977 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,3 +26,55 @@ services:
       - CORS_ALLOWED_ORIGINS=https://ut.khoavo.myds.me,http://ut.khoavo.myds.me:5011,http://localhost:3000,http://127.0.0.1:3000
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
+
+  forgejo:
+    image: codeberg.org/forgejo/forgejo:7.0.16
+    container_name: forgejo
+    environment:
+      - USER_UID=1026
+      - USER_GID=100
+      - GITEA__database__DB_TYPE=sqlite3
+      - TZ=Asia/Ho_Chi_Minh
+      - GITEA__actions__ENABLED=true
+      - INSTALL_LOCK=true
+      - FORGEJO__server__ROOT_URL=http://nas:3050/
+    restart: always
+    networks:
+      - kv-tube
+    volumes:
+      - ./forgejo-data:/data
+    ports:
+      - "3050:3000"
+      - "2222:22"
+
+  forgejo-runner:
+    image: code.forgejo.org/forgejo/runner:latest
+    container_name: forgejo_runner
+    restart: always
+    user: "0:0"
+    privileged: true
+    depends_on:
+      - forgejo
+    networks:
+      - kv-tube
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./forgejo-runner-data:/data
+    entrypoint:
+      - sh
+      - -c
+      - |
+        if [ ! -f /data/.runner ]; then
+          forgejo-runner register --no-interactive \
+            --instance http://forgejo:3000 \
+            --token d5XKhmpu4lTR7P516juCjEes6QsI4qFvVean3zqT \
+            --name synology-runner \
+            --labels ubuntu-latest,ubuntu-22.04,docker:host
+        fi
+        forgejo-runner daemon
+    environment:
+      - TZ=Asia/Ho_Chi_Minh
+
+networks:
+  kv-tube:
+    driver: bridge