From 917a71b2e061e6f1501c6d1d1f0166a40c7bd4ae Mon Sep 17 00:00:00 2001
From: LiuShen <3162475700@qq.com>
Date: Sat, 12 Jul 2025 15:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=B6=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=AE=9E=E7=8E=B0=E5=AE=B9=E5=99=A8=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E6=93=8D=E4=BD=9C=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=A2=AB?=
 =?UTF-8?q?=E5=88=A0=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 forgejo-runner/7.0.0/docker-compose.yml  | 17 ++---------------
 forgejo-runner/7.0.0/scripts/register.sh | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 forgejo-runner/7.0.0/scripts/register.sh

diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml
index f14192466..bbe82ad12 100644
--- a/forgejo-runner/7.0.0/docker-compose.yml
+++ b/forgejo-runner/7.0.0/docker-compose.yml
@@ -6,23 +6,10 @@ services:
     container_name: ${CONTAINER_NAME:-forgejo-runner}
     restart: always
     user: "1000:1000"  # 非 root 用户运行容器
-    command: >-
-      /bin/sh -c '
-        cd /data &&
-        if [ ! -s .runner ]; then
-          echo ">>> Registering runner..."
-          forgejo-runner register --no-interactive \
-            --instance ${FORGEJO_INSTANCE_URL} \
-            --token ${RUNNER_REGISTRATION_TOKEN} \
-            --name ${RUNNER_NAME} \
-            --labels ${RUNNER_LABELS};
-          forgejo-runner generate-config > config.yml
-        fi;
-        echo ">>> Starting daemon..."
-        forgejo-runner --config config.yml daemon
-      '
+    command: "command: chmod +x /data/scripts/register.sh && /data/scripts/register.sh"
     volumes:
       - ./data:/data
+      - ./scripts/register.sh:/data/scripts/register.sh:ro
       - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock
     environment:
       - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL}
diff --git a/forgejo-runner/7.0.0/scripts/register.sh b/forgejo-runner/7.0.0/scripts/register.sh
new file mode 100644
index 000000000..1f4a73f27
--- /dev/null
+++ b/forgejo-runner/7.0.0/scripts/register.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+cd /data
+
+if [ ! -s .runner ]; then
+  echo ">>> Registering runner..."
+  forgejo-runner register --no-interactive \
+    --instance "$FORGEJO_INSTANCE_URL" \
+    --token "$RUNNER_REGISTRATION_TOKEN" \
+    --name "$RUNNER_NAME" \
+    --labels "$RUNNER_LABELS"
+  forgejo-runner generate-config > config.yml
+fi
+
+echo ">>> Starting daemon..."
+exec forgejo-runner --config config.yml daemon