fix: docker images build

Author: soulteary

.github/workflows/build.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Build Manager
         run: |
-          go build -ldflags "-s -w -X main.Version=${{ steps.version.outputs.version }}" -o runner-manager .
+          go build -ldflags "-s -w -X main.Version=${{ steps.version.outputs.version }}" -o runner-manager ./cmd/runner-manager
 
       - name: Build Runner Agent (container mode)
         run: go build -o runner-agent ./cmd/runner-agent

.github/workflows/release.yml

@@ -53,10 +53,10 @@ jobs:
           VERSION=${{ steps.version.outputs.version }}
           COMMIT=${{ github.sha }}
           LDFLAGS="-s -w -X main.Version=v${VERSION}"
-          GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-linux-amd64 .
-          GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-linux-arm64 .
-          GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-darwin-amd64 .
-          GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-darwin-arm64 .
+          GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-linux-amd64 ./cmd/runner-manager
+          GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-linux-arm64 ./cmd/runner-manager
+          GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-darwin-amd64 ./cmd/runner-manager
+          GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "${LDFLAGS}" -o dist/runner-manager-darwin-arm64 ./cmd/runner-manager
 
       - name: Generate checksums
         run: |

Dockerfile

@@ -1,11 +1,15 @@
 # Runner Fleet Manager：多阶段构建，编译 + Ubuntu 运行时（避免 Alpine 导致 GitHub Runner 运行异常）
-FROM golang:1.26-bookworm AS builder
+# 使用 BUILDPLATFORM 让 builder 在宿主机(amd64)上运行，TARGETOS/TARGETARCH 交叉编译，避免 QEMU 下 go build 失败
+ARG BUILDPLATFORM=linux/amd64
+FROM --platform=$BUILDPLATFORM golang:1.26-bookworm AS builder
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
 ARG VERSION=dev
-RUN CGO_ENABLED=0 go build -ldflags "-X main.Version=${VERSION}" -o runner-manager .
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags "-X main.Version=${VERSION}" -o runner-manager ./cmd/runner-manager
 
 FROM ubuntu:24.04
 LABEL org.opencontainers.image.title="Runner Fleet Manager" \

Makefile

@@ -5,13 +5,18 @@ VERSION ?= dev
 # 本地构建 Runner 镜像的默认 tag；使用 CI 推送的镜像时为同仓库名、tag 带 -runner，如 ghcr.io/<owner>/<repo>:main-runner
 RUNNER_IMAGE ?= ghcr.io/soulteary/runner-fleet-runner:main
 
-.PHONY: build test run docker-build docker-build-runner docker-run docker-stop clean help
+.PHONY: build build-agent build-all test run docker-build docker-build-runner docker-run docker-stop clean help
 
 help:
-	@echo "targets: build test run docker-build docker-build-runner docker-run docker-stop clean"
+	@echo "targets: build build-agent build-all test run docker-build docker-build-runner docker-run docker-stop clean"
 
 build:
-	go build -ldflags "-X main.Version=$(VERSION)" -o $(BINARY) .
+	go build -ldflags "-X main.Version=$(VERSION)" -o $(BINARY) ./cmd/runner-manager
+
+build-agent:
+	go build -o runner-agent ./cmd/runner-agent
+
+build-all: build build-agent
 
 test:
 	go test ./...
@@ -35,4 +40,4 @@ docker-stop:
 	-docker stop runner-manager 2>/dev/null; docker rm runner-manager 2>/dev/null; true
 
 clean:
-	rm -f $(BINARY)
+	rm -f $(BINARY) runner-agent

README.md

@@ -21,7 +21,7 @@ CI：push 到 `main`/`master` 时通过 [GitHub Actions](.github/workflows/build
 cp config.yaml.example config.yaml
 
 # 2. 二选一：本地运行 或 Docker
-go run .                    # 需 Go 1.26
+go run ./cmd/runner-manager # 需 Go 1.26
 # 或 Docker（需挂载 config 与 runners，详见 docs/docker.md）
 make docker-build && make docker-run
 # 或使用已发布镜像：见 docs/docker.md 中的「运行容器」与 DinD 说明

docs/development.md

@@ -8,19 +8,24 @@
 
 ```bash
 # 生成可执行文件 runner-manager
-go build -o runner-manager .
+go build -o runner-manager ./cmd/runner-manager
 
 # 注入版本号（便于 /version 与排障）
-go build -ldflags "-X main.Version=1.0.0" -o runner-manager .
+go build -ldflags "-X main.Version=1.0.0" -o runner-manager ./cmd/runner-manager
+
+# 仅构建 Runner Agent（容器模式用）
+go build -o runner-agent ./cmd/runner-agent
+
+# 或使用 Make：make build / make build-agent / make build-all
 ```
 
-模板已通过 `embed` 内嵌，可执行文件可单文件分发，无需附带 `templates/` 目录。
+模板已通过 `embed` 内嵌于 Manager 二进制（`cmd/runner-manager/templates/`），可执行文件可单文件分发，无需附带 `templates/` 目录。
 
 ## 本地开发
 
 ```bash
 # 需先有 config.yaml（可 cp config.yaml.example config.yaml）
-go run .
+go run ./cmd/runner-manager
 
 # 或：先 build 再运行
 make run
@@ -53,12 +58,14 @@ make run
 ## Makefile 目标
 
 - `make help`：查看全部目标。
-- `make build`：构建（带 Version ldflags）。
+- `make build`：构建 Manager（带 Version ldflags）。
+- `make build-agent`：构建 Runner Agent（容器模式用）。
+- `make build-all`：同时构建 Manager 与 Agent。
 - `make test`：运行测试。
-- `make run`：先 build 再运行当前目录二进制。
+- `make run`：先 build 再运行 Manager。
 - `make docker-build` / `make docker-run` / `make docker-stop`：Manager 镜像构建与运行，见 [Docker 部署](docker.md)。
 - `make docker-build-runner`：构建容器模式用的 Runner 镜像（`Dockerfile.runner`，默认 tag 见 `RUNNER_IMAGE`）。
-- `make clean`：删除生成的二进制。
+- `make clean`：删除生成的二进制（runner-manager、runner-agent）。
 
 容器模式下 Runner 容器内运行的是 `cmd/runner-agent` 编译出的 Agent，仅构建 Manager 时不会包含该二进制；Runner 镜像单独用 `Dockerfile.runner` 构建。