From f5a97c24c5c9b57366594d4cbe676f9f60351d46 Mon Sep 17 00:00:00 2001
From: LiuShen <3162475700@qq.com>
Date: Sun, 13 Jul 2025 09:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E4=BF=AE=E6=94=B9=E6=88=90root?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9B=B4=E6=8E=A5=E8=B7=91=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=80=83=E8=99=91=E9=83=A8=E5=88=86=E5=AE=89=E5=85=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 forgejo-runner/7.0.0/docker-compose.yml   | 26 +++++------------------
 forgejo-runner/7.0.0/scripts/init.sh      | 14 ------------
 forgejo-runner/7.0.0/scripts/uninstall.sh | 21 ------------------
 3 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 forgejo-runner/7.0.0/scripts/uninstall.sh

diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml
index 431e3ee99..b7d507ddd 100644
--- a/forgejo-runner/7.0.0/docker-compose.yml
+++ b/forgejo-runner/7.0.0/docker-compose.yml
@@ -1,36 +1,20 @@
 version: "3.9"
 services:
-  dind:
-    image: docker:dind
-    container_name: forgejo-dind
-    privileged: true
-    restart: 'unless-stopped'
-    command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false']
-    environment:
-      DOCKER_TLS_CERTDIR: ""
-    networks:
-      - 1panel-network
   forgejo_runner:
     image: code.forgejo.org/forgejo/runner:7.0.0
     container_name: ${CONTAINER_NAME:-forgejo-runner}
-    depends_on:
-      dind:
-        condition: service_started
-    links:
-      - dind
     restart: always
-    user: "1000:1000"  # 非 root 用户运行容器
     command: "/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
+      - /var/run/docker.sock:/var/run/docker.sock  # 使用宿主机 Docker
     environment:
-      - DOCKER_HOST=tcp://dind:2375
+      - DOCKER_HOST=unix:///var/run/docker.sock  # 指定宿主机 socket
       - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL}
       - RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN}
-      - RUNNER_NAME=${RUNNER_NAME:-default-runner}
-      - RUNNER_LABELS=${RUNNER_LABELS:-docker:docker://node:20-bookworm}
+      - RUNNER_NAME=${RUNNER_NAME}
+      - RUNNER_LABELS=${RUNNER_LABELS}
     networks:
       - 1panel-network
     labels:
@@ -38,4 +22,4 @@ services:
 
 networks:
   1panel-network:
-    external: true
\ No newline at end of file
+    external: true
diff --git a/forgejo-runner/7.0.0/scripts/init.sh b/forgejo-runner/7.0.0/scripts/init.sh
index fab55c447..7bb9c32f2 100644
--- a/forgejo-runner/7.0.0/scripts/init.sh
+++ b/forgejo-runner/7.0.0/scripts/init.sh
@@ -16,20 +16,6 @@ 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"
-
-# # 如果 context 已存在，则先删除
-# if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then
-#   docker context rm -f "$CONTEXT_NAME"
-#   echo "已删除旧的 Docker context: $CONTEXT_NAME"
-# fi
-
-# docker context create "$CONTEXT_NAME" \
-#   --docker "host=unix://$SOCK_PATH"
-
 echo "✅ 初始化完成："
 echo " - 已创建 ./data 并配置权限"
 echo " - 已创建 ./scripts/register.sh 并配置权限"
-# echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH"
diff --git a/forgejo-runner/7.0.0/scripts/uninstall.sh b/forgejo-runner/7.0.0/scripts/uninstall.sh
deleted file mode 100644
index 5f09780b9..000000000
--- a/forgejo-runner/7.0.0/scripts/uninstall.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# #!/bin/bash
-# set -e
-
-# CONTEXT_NAME="forgejo-runner-context"
-# SOCK_PATH="/var/run/docker-forgejo-runner.sock"
-
-# # 删除 Docker context
-# if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then
-#   docker context rm -f "$CONTEXT_NAME"
-#   echo "🗑️ 已删除 Docker context: $CONTEXT_NAME"
-# else
-#   echo "⚠️ Docker context $CONTEXT_NAME 不存在，跳过删除。"
-# fi
-
-# # 删除 socket 文件（如果存在）
-# if [ -S "$SOCK_PATH" ]; then
-#   rm -f "$SOCK_PATH"
-#   echo "🗑️ 已删除 socket 文件: $SOCK_PATH"
-# else
-#   echo "⚠️ Socket 文件 $SOCK_PATH 不存在，跳过删除。"
-# fi
\ No newline at end of file