gitea，gitea-runner写入docker-compose

docker-compose-infra-main.yml

@@ -192,7 +192,7 @@ services:
   # k3s 在 121.37.117.181，经宿主机 systemd 服务 k3s-ssh-tunnel.service
   # (ssh -L 16443:127.0.0.1:6443) 隧道访问，故 runner 必须与隧道同网络命名空间
   gitea-runner:
-    image: gitea/act_runner:latest
+    image: gitea/act_runner:0.6.1
     container_name: gitea-runner
     restart: unless-stopped
     network_mode: host
@@ -202,11 +202,14 @@ services:
     environment:
       GITEA_INSTANCE_URL: http://127.0.0.1:3000
       GITEA_RUNNER_REGISTRATION_TOKEN: 9lGvGJxk7M781IYBWDV0ZuZpXV5RkGKlIpkhRVNs
-      TAGS: "ubuntu-latest:host"
+      GITEA_RUNNER_NAME: gitea-runner
+      # host 标签：job 直接在 runner 容器内执行，才能使用挂载的 kubectl/kubeconfig
+      GITEA_RUNNER_LABELS: "ubuntu-latest:host"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /data/gitea-runner:/data
       - /data/gitea-runner/bin/kubectl:/usr/local/bin/kubectl
+      - /data/gitea-runner/bin/docker:/usr/local/bin/docker
       - /data/gitea-runner/.kube/config:/root/.kube/config
     healthcheck:
       test: ["CMD-SHELL", "test -f /data/.runner"]

服务器运维.txt

@@ -18,21 +18,7 @@ sudo systemctl restart docker
 docker info | grep -A 5 "Registry Mirrors"
 
 
-//k3s
-主节点：curl -sfL https://get.k3s.io | sh -s - server \
-    --data-dir /data/k3s \
-    --write-kubeconfig-mode 644 \
-    --disable traefik \
-    --disable metrics-server \
-    --disable local-storage \
-    --disable coredns \
-    --pause-image m.daocloud.io/rancher/mirrored-pause:3.6
-主节点：cat /data/k3s/server/node-token
-从节点：cat > /etc/rancher/k3s/config.yaml <<EOF
-    server: https://116.204.74.41:6443
-    token: K105c70ea9181a9f5e6e41f7f0b60bb1e0edb2bb514b84e9ee1b39c83eafad7d823::server:586b394206559f9fb6249df0ecf0148a
-    data-dir: /data/k3s
-    EOF
-
-//gitea-runner
-docker rm -f gitea-runner && docker run -d --name gitea-runner --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /data/gitea-runner:/data -v /data/gitea-runner/bin/kubectl:/usr/local/bin/kubectl -v /data/gitea-runner/.kube/config:/root/.kube/config -e GITEA_INSTANCE_URL="http://192.168.0.83:3000" -e GITEA_RUNNER_REGISTRATION_TOKEN="YCDqfvhtF736KfVHwzN3V06h13WolhiWIxND8mFl" -e TAGS="ubuntu-latest:host" gitea/act_runner:latest
+//gitea-runner（已由 docker-compose-infra-main.yml 管理，host 标签，勿手动 docker run）
+//  启动：DOCKER_HOST=ssh://root@116.204.74.41 docker compose -f deploy/docker-compose-infra-main.yml up -d gitea-runner
+//  网络：network_mode host（kubectl 经宿主机 systemd 隧道 k3s-ssh-tunnel.service 访问 k3s:121.37.117.181）
+//  注意：标签用 GITEA_RUNNER_LABELS="ubuntu-latest:host"（TAGS 无效）；改标签需删 /data/gitea-runner/.runner 重新注册