From 36b6d9e9dc9139c0c600d698501d34252962022a Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 12 Jul 2025 16:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=97=E4=BF=AE=E6=94=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=BA=E5=A4=96=E9=83=A8=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=86=85=E9=83=A8=E8=BF=9B=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 5 ++--- forgejo-runner/7.0.0/scripts/init.sh | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index bbe82ad12..1b4b9d4d6 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -1,15 +1,14 @@ version: "3.9" - services: forgejo_runner: image: code.forgejo.org/forgejo/runner:7.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: "1000:1000" # 非 root 用户运行容器 - command: "command: chmod +x /data/scripts/register.sh && /data/scripts/register.sh" + command: "/data/scripts/register.sh" volumes: - ./data:/data - - ./scripts/register.sh:/data/scripts/register.sh:ro + - ./scripts/register.sh:/data/scripts/register.sh - /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/init.sh b/forgejo-runner/7.0.0/scripts/init.sh index 76edf8ba9..ff459c1a6 100644 --- a/forgejo-runner/7.0.0/scripts/init.sh +++ b/forgejo-runner/7.0.0/scripts/init.sh @@ -14,6 +14,8 @@ chmod 775 data/.cache chmod g+s data/.runner chmod g+s data/.cache +chmod +x ./scripts/register.sh + # 创建自定义 docker context 指向 /var/run/docker-forgejo-runner.sock SOCK_PATH="/var/run/docker-forgejo-runner.sock" CONTEXT_NAME="forgejo-runner-context" @@ -29,4 +31,5 @@ docker context create "$CONTEXT_NAME" \ echo "✅ 初始化完成:" echo " - 已创建 ./data 并配置权限" +echo " - 已创建 ./scripts/register.sh 并配置权限" echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH"