diff --git a/docker-compose.runner.yaml b/docker-compose.runner.yaml index c834d68..73ceb24 100644 --- a/docker-compose.runner.yaml +++ b/docker-compose.runner.yaml @@ -1,5 +1,8 @@ --- # yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json +# +# ssh root@IP "cd /root/_docker-compose/GITEA_RUNNER && docker compose pull && docker compose up -d" +# x-runner-env: &runner-env TZ: Asia/Shanghai @@ -67,18 +70,18 @@ x-runner-command: &runner-command } >/tmp/runner-config.yaml if [ ! -s /data/.runner ]; then - act_runner --config /tmp/runner-config.yaml register --no-interactive \ + gitea-runner --config /tmp/runner-config.yaml register --no-interactive \ --instance "$${GITEA_INSTANCE_URL}" \ --token "$${GITEA_RUNNER_REGISTRATION_TOKEN}" \ --name "$${GITEA_RUNNER_NAME}" \ --labels "$$labels" fi - exec act_runner --config /tmp/runner-config.yaml daemon + exec gitea-runner --config /tmp/runner-config.yaml daemon x-runner-common: &runner-common - # image: docker.io/gitea/act_runner:v0.6.0 - image: docker.io/gitea/act_runner:nightly + # image: docker.io/gitea/runner:1.0.8 + image: docker.io/gitea/runner:nightly restart: unless-stopped # pull_policy: always stop_signal: SIGINT @@ -90,16 +93,16 @@ x-runner-common: &runner-common command: *runner-command services: - runner-yanhao_ren: # ❗️1️⃣ + runner-git.yanhao.ren: # ❗️1️⃣ <<: *runner-common - container_name: gitea_runner_yanhao_ren # ❗️2️⃣ + container_name: gitea_runner_git.yanhao.ren # ❗️2️⃣ environment: <<: *runner-env - RUNNER_INSTANCE_NAME: yanhao_ren # ❗️3️⃣ + RUNNER_INSTANCE_NAME: git.yanhao.ren # ❗️3️⃣ GITEA_INSTANCE_URL: "https://git.yanhao.ren" # ❗️4️⃣ GITEA_RUNNER_REGISTRATION_TOKEN: # ❗️5️⃣ volumes: - - gitea_runner_yanhao_ren_data:/data # ❗️6️⃣ + - gitea_runner_git.yanhao.ren_data:/data # ❗️6️⃣ - /var/run/docker.sock:/var/run/docker.sock:ro - /etc/localtime:/etc/localtime:ro @@ -117,5 +120,5 @@ services: - /etc/localtime:/etc/localtime:ro volumes: - gitea_runner_yanhao_ren_data: + gitea_runner_git.yanhao.ren_data: gitea_runner_git.1-h.cc_data: \ No newline at end of file