From 05a409d7098eb06f689a28e80dbccb2279acc70d Mon Sep 17 00:00:00 2001
From: LiuShen <3162475700@qq.com>
Date: Sat, 12 Jul 2025 11:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=A3=E5=87=BA=E4=BA=86=E7=82=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=BB=A7=E7=BB=AD=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?runner=E7=9A=84compose=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 forgejo-runner/7.0.0/docker-compose.yml | 27 ++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml
index dc8e81f08..fcbaa9c43 100644
--- a/forgejo-runner/7.0.0/docker-compose.yml
+++ b/forgejo-runner/7.0.0/docker-compose.yml
@@ -1,3 +1,5 @@
+version: "3.9"
+
 services:
   forgejo_runner:
     image: code.forgejo.org/forgejo/runner:7.0.0
@@ -5,19 +7,30 @@ services:
     restart: always
     networks:
       - 1panel-network
+    command: >-
+      bash -c '
+        if [ ! -f /data/.runner ]; then
+          forgejo-runner create-runner-file --connect \
+            --instance ${FORGEJO_INSTANCE_URL} \
+            --name ${RUNNER_NAME} \
+            --secret ${RUNNER_SHARED_SECRET} ;
+          sed -i -e "s|\"labels\": null|\"labels\": [\"${RUNNER_LABELS}\"]|" /data/.runner ;
+          forgejo-runner generate-config --config /data/config.yml ;
+          sed -i -e "s|  level: info|  level: debug|" /data/config.yml ;
+        fi ;
+        forgejo-runner --config /data/config.yml daemon
+      '
     volumes:
-      #- ./data/config.yaml:/config.yaml # 可选配置
-      - ./data/data:/data
+      - ./data:/data
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      #- CONFIG_FILE=/config.yaml
       - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL}
-      - FORGEJO_RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN}
-      - FORGEJO_RUNNER_NAME=${RUNNER_NAME}
-      - FORGEJO_RUNNER_LABELS=${RUNNER_LABELS}
+      - RUNNER_NAME=${RUNNER_NAME}
+      - RUNNER_LABELS=${RUNNER_LABELS}
+      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET}
     labels:  
       createdBy: "Apps"
 
-networks:  
+networks:
   1panel-network:
     external: true