From 1c13a4a09e745175d1f3fc78ec5239caab0c9198 Mon Sep 17 00:00:00 2001
From: Khoa Vo <khoavo@myds.me>
Date: Thu, 14 May 2026 12:09:41 +0700
Subject: [PATCH] chore: update forgejo to v9 and runner to 6.0.1

---
 docker-compose.forgejo.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/docker-compose.forgejo.yml b/docker-compose.forgejo.yml
index 24906e7..4089831 100644
--- a/docker-compose.forgejo.yml
+++ b/docker-compose.forgejo.yml
@@ -1,6 +1,6 @@
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7.0.16
+    image: codeberg.org/forgejo/forgejo:9
     container_name: forgejo
     environment:
       - USER_UID=1026
@@ -9,24 +9,27 @@ services:
       - TZ=Asia/Ho_Chi_Minh
       - GITEA__actions__ENABLED=true
       - INSTALL_LOCK=true
-      - FORGEJO__server__ROOT_URL=http://nas:3050/
+      - FORGEJO__server__ROOT_URL=https://git.khoavo.myds.me/
+      - FORGEJO__server__DOMAIN=git.khoavo.myds.me
     restart: always
+    networks:
+      - forgejo_custom_net
     volumes:
       - ./forgejo-data:/data
     ports:
       - "3050:3000"
       - "2222:22"
-    networks:
-      - kv-tube_default
 
   forgejo-runner:
-    image: code.forgejo.org/forgejo/runner:latest
+    image: code.forgejo.org/forgejo/runner:6.0.1
     container_name: forgejo_runner
     restart: always
     user: "0:0"
     privileged: true
     depends_on:
       - forgejo
+    networks:
+      - forgejo_custom_net
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./forgejo-runner-data:/data
@@ -34,20 +37,20 @@ services:
       - sh
       - -c
       - |
-        apt-get update && apt-get install -y docker.io nodejs npm
         if [ ! -f /data/.runner ]; then
           forgejo-runner register --no-interactive \
-            --instance http://forgejo:3000 \
-            --token d5XKhmpu4lTR7P516juCjEes6QsI4qFvVean3zqT \
+            --instance https://git.khoavo.myds.me \
+            --token ixTnxVSAkJDEB3c2GhkUXKF9R5j09cQYoEgrC17Z \
             --name synology-runner \
             --labels ubuntu-latest,ubuntu-22.04,docker:host
         fi
         forgejo-runner daemon
     environment:
       - TZ=Asia/Ho_Chi_Minh
-    networks:
-      - kv-tube_default
 
 networks:
-  kv-tube_default:
-    external: true
+  forgejo_custom_net:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 10.38.0.0/24
\ No newline at end of file