chore: use config/config.yaml

Author: soulteary

.dockerignore

@@ -8,7 +8,7 @@
 /runner-agent
 *.exe
 runners
-config.yaml
+config/config.yaml
 .env
 *.test
 *.out

.env.example

@@ -8,10 +8,10 @@
 # MANAGER_IMAGE=ghcr.io/soulteary/runner-fleet:v1.0.0
 # 开发/尝鲜可使用 main：MANAGER_IMAGE=ghcr.io/soulteary/runner-fleet:main
 #
-# config.yaml 中未设置 container_image 时，Manager 内默认 Runner 镜像：优先从 MANAGER_IMAGE 推导（如 v1.0.0 -> v1.0.0-runner），否则由 FLEET_IMAGE_TAG 决定（未设则为 v1.0.0）。
+# config/config.yaml 中未设置 container_image 时，Manager 内默认 Runner 镜像：优先从 MANAGER_IMAGE 推导（如 v1.0.0 -> v1.0.0-runner），否则由 FLEET_IMAGE_TAG 决定（未设则为 v1.0.0）。
 # 例如使用 main 版 Runner 镜像：FLEET_IMAGE_TAG=main
 #
-# 宿主机映射端口，默认 8080（同时覆盖 config.yaml 中 server.port）
+# 宿主机映射端口，默认 8080（同时覆盖 config/config.yaml 中 server.port）
 # MANAGER_PORT=8080
 #
 # Job 内 Docker 使用 DinD（仅非容器模式时有效）。容器模式下请勿设置此项，Manager 必须用宿主机 socket。
@@ -25,7 +25,7 @@
 # BASIC_AUTH_USER=admin   # 可选，默认 admin
 # BASIC_AUTH_PASSWORD=   # 设置后启用 Basic Auth，留空则不鉴权
 #
-# === 以下用于覆盖 config.yaml，便于全容器部署（仅改 .env 即可，无需改 config.yaml）===
+# === 以下用于覆盖 config/config.yaml，便于全容器部署（仅改 .env 即可，无需改配置文件）===
 # CONTAINER_MODE=true
 # RUNNER_IMAGE=ghcr.io/soulteary/runner-fleet:v1.0.0-runner   # 不设则从 MANAGER_IMAGE 自动推导
 # CONTAINER_NETWORK=runner-net

.github/workflows/ci-manager.yml

@@ -91,14 +91,14 @@ jobs:
 
       - name: Init example config
         if: steps.modroot.outputs.found == 'true'
-        run: cp config.yaml.example config.yaml
+        run: mkdir -p config && cp config.yaml.example config/config.yaml
         working-directory: ${{ steps.modroot.outputs.root }}
 
       - name: Verify binary
         if: steps.modroot.outputs.found == 'true'
         run: |
           ./runner-manager -version
-          ./runner-manager -config config.yaml &
+          ./runner-manager -config config/config.yaml &
           PID=$!
           trap "kill $PID 2>/dev/null || true; wait $PID 2>/dev/null || true" EXIT
           for i in 1 2 3 4 5; do sleep 1; curl -sf http://localhost:8080/health | grep -q '"status":"ok"' && break; done

.github/workflows/publish-image-manager.yml

@@ -100,7 +100,7 @@ jobs:
             type=semver,pattern={{major}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
 
-      # Dockerfile 内已 COPY config.yaml.example 并 sed 为 config.yaml，无需在 workflow 中准备
+      # Dockerfile 内已 COPY config.yaml.example 为 config/config.yaml 并 sed，无需在 workflow 中准备
 
       - name: Build and push Manager image
         if: steps.verify.outputs.has_go_source == 'true'

.github/workflows/release-manager.yml

@@ -66,7 +66,7 @@ jobs:
           cd dist
           sha256sum * > checksums.txt
 
-      # Dockerfile 内已 COPY config.yaml.example 并 sed 为 config.yaml，无需在 workflow 中准备
+      # Dockerfile 内已 COPY config.yaml.example 为 config/config.yaml 并 sed，无需在 workflow 中准备
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.gitignore

@@ -9,7 +9,7 @@
 # **/.github_check_token
 
 # 本地配置（若含敏感信息建议加入）
-config.yaml
+config/config.yaml
 .env
 
 # IDE

Dockerfile

@@ -29,9 +29,9 @@ RUN install -m 0755 -d /etc/apt/keyrings \
 RUN groupadd -g 1001 app && useradd -r -u 1001 -g app -d /app -s /bin/bash app
 WORKDIR /app
 COPY --from=builder /app/runner-manager .
-COPY config.yaml.example ./config.yaml
+COPY config.yaml.example ./config/config.yaml
 COPY scripts/install-runner.sh /app/scripts/install-runner.sh
-RUN sed -i 's|base_path: ./runners|base_path: /app/runners|' config.yaml \
+RUN sed -i 's|base_path: ./runners|base_path: /app/runners|' config/config.yaml \
     && mkdir -p /app/runners \
     && chmod +x /app/scripts/install-runner.sh && chown -R app:app /app
 
@@ -40,4 +40,4 @@ EXPOSE 8080
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
     CMD curl -fsS http://127.0.0.1:8080/health || exit 1
 ENTRYPOINT ["./runner-manager"]
-CMD ["-config", "/app/config.yaml"]
+CMD ["-config", "/app/config/config.yaml"]

Makefile

@@ -33,7 +33,7 @@ docker-build-runner:
 # 需 Basic Auth 时请使用 docker compose（会读取 .env），或在本 target 的 docker run 中增加 -e BASIC_AUTH_PASSWORD=... -e BASIC_AUTH_USER=admin
 docker-run: docker-stop
 	docker run -d --name runner-manager -p 8080:8080 \
-		-v $(PWD)/config.yaml:/app/config.yaml \
+		-v $(PWD)/config:/app/config \
 		-v $(PWD)/runners:/app/runners \
 		runner-manager:$(VERSION)
 

README.md

@@ -29,9 +29,9 @@ HTTP management UI built with Golang Echo to view and manage multiple self-hoste
 ## Quick start
 
 ```bash
-cp config.yaml.example config.yaml
-# Edit config.yaml: set runners.base_path to /app/runners
-# On host: mkdir -p runners && chown 1001:1001 config.yaml runners
+mkdir -p config && cp config.yaml.example config/config.yaml
+# Edit config/config.yaml: set runners.base_path to /app/runners
+# On host: mkdir -p runners && chown 1001:1001 config runners
 
 docker network create runner-net 2>/dev/null || true
 docker compose up -d

cmd/runner-manager/main.go

@@ -54,7 +54,7 @@ func newTemplateRenderer() *templateRenderer {
 }
 
 func main() {
-	configPath := flag.String("config", "config.yaml", "配置文件路径")
+	configPath := flag.String("config", "config/config.yaml", "配置文件路径")
 	showVersion := flag.Bool("version", false, "显示版本号后退出")
 	flag.Parse()