mrlee/Havline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(updater): 自动定位宿主机 Compose 目录并发布 v1.3.6

Browse Source
This commit is contained in:
mrlee
2026-09-28 11:10:14 +08:00
parent 3f23610e59
commit d154aef807
13 changed files with 235 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/updater/runner.go
+46 -2
View File
@@ -22,7 +22,7 @@ func (s *Server) runUpdate(ctx context.Context) error {
s.state.Phase = PhaseRunning
s.state.Message = "正在准备升级"
s.mu.Unlock()
if err := s.ensureComposeFile(); err != nil {
if err := s.ensureComposeFile(ctx); err != nil {
return err
}
@@ -316,11 +316,55 @@ func imageTag(image string) string {
}
func (s *Server) compose(ctx context.Context, version string, args ...string) (string, error) {
fullArgs := append([]string{"compose", "-f", s.composePath}, args...)
plan, err := s.resolveComposePlan(ctx)
if err != nil {
return "", err
}
if plan.helper {
return s.composeViaHelper(ctx, plan, version, args...)
}
fullArgs := append([]string{"compose", "-f", plan.containerCompose}, args...)
env := []string{"FONU_VERSION=" + version}
return runCommand(ctx, s.cfg.ProjectDir, env, "docker", fullArgs...)
}
func (s *Server) composeViaHelper(ctx context.Context, plan composePlan, version string, args ...string) (string, error) {
image, err := s.selfImage(ctx)
if err != nil {
return "", err
}
helperArgs := []string{
"run", "--rm", "--entrypoint", "docker",
"-v", s.cfg.DockerSocket + ":/var/run/docker.sock",
"-v", plan.hostProjectDir + ":/workspace",
"-w", "/workspace",
"-e", "FONU_VERSION=" + version,
image,
"compose", "-f", plan.helperComposePath,
}
helperArgs = append(helperArgs, args...)
return runCommand(ctx, "", nil, "docker", helperArgs...)
}
func (s *Server) selfImage(ctx context.Context) (string, error) {
if s.cfg.SelfImage != "" {
return s.cfg.SelfImage, nil
}
hostname, err := os.Hostname()
if err != nil {
return "", err
}
output, err := runCommand(ctx, "", nil, "docker", "inspect", "--format", "{{.Config.Image}}", hostname)
if err != nil {
return "", fmt.Errorf("无法识别 updater 镜像：%w", err)
}
image := strings.TrimSpace(output)
if image == "" {
return "", fmt.Errorf("无法识别 updater 镜像")
}
return image, nil
}
func runCommand(ctx context.Context, dir string, extraEnv []string, name string, args ...string) (string, error) {
command := exec.CommandContext(ctx, name, args...)
command.Dir = dir
internal/updater/server.go
+112 -16
View File
@@ -22,16 +22,19 @@ var serviceNamePattern = regexp.MustCompile(`^[a-zA-Z0-9_.-]+$`)
// Config 是 fonu-updater sidecar 的运行配置。
type Config struct {
SocketPath string
ProjectDir string
ComposeFile string
Service string
Mode string
RepoURL string
Branch string
AppURL string
BuildTimeout time.Duration
HealthTimeout time.Duration
SocketPath string
ProjectDir string
ComposeFile string
Service string
Mode string
RepoURL string
Branch string
AppURL string
HostProjectDir string
SelfImage string
DockerSocket string
BuildTimeout time.Duration
HealthTimeout time.Duration
}
type Server struct {
@@ -44,6 +47,14 @@ type Server struct {
lastChecked time.Time
}
type composePlan struct {
helper bool
containerCompose string
hostProjectDir string
hostComposePath string
helperComposePath string
}
// NewServer 校验 sidecar 配置；参数不正确时拒绝启动。
func NewServer(cfg Config, logger *slog.Logger) (*Server, error) {
cfg.SocketPath = strings.TrimSpace(cfg.SocketPath)
@@ -68,6 +79,11 @@ func NewServer(cfg Config, logger *slog.Logger) (*Server, error) {
if strings.TrimSpace(cfg.AppURL) == "" {
cfg.AppURL = "http://fonu:6893"
}
if strings.TrimSpace(cfg.DockerSocket) == "" {
cfg.DockerSocket = "/var/run/docker.sock"
}
cfg.HostProjectDir = strings.TrimSpace(cfg.HostProjectDir)
cfg.SelfImage = strings.TrimSpace(cfg.SelfImage)
if cfg.BuildTimeout <= 0 {
cfg.BuildTimeout = 30 * time.Minute
}
@@ -162,15 +178,95 @@ func (s *Server) handleApply(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusAccepted, status)
}
func (s *Server) ensureComposeFile() error {
func (s *Server) ensureComposeFile(ctx context.Context) error {
_, err := s.resolveComposePlan(ctx)
return err
}
func (s *Server) resolveComposePlan(ctx context.Context) (composePlan, error) {
info, err := os.Stat(s.composePath)
if err == nil && !info.IsDir() {
return composePlan{containerCompose: s.composePath}, nil
}
if err == nil && info.IsDir() {
return composePlan{}, fmt.Errorf("Compose 路径是目录而不是文件：%s", s.composePath)
}
hostDir, hostComposePath, discoverErr := s.discoverHostCompose(ctx)
if discoverErr == nil {
helperPath, pathErr := helperComposePath(hostDir, hostComposePath)
if pathErr == nil {
return composePlan{
helper: true,
hostProjectDir: hostDir,
hostComposePath: hostComposePath,
helperComposePath: helperPath,
}, nil
}
}
return composePlan{}, fmt.Errorf("找不到 Compose 文件 %s，且无法自动定位宿主机目录；请设置 FONU_UPDATE_HOST_DIR", s.composePath)
}
func (s *Server) discoverHostCompose(ctx context.Context) (string, string, error) {
if s.cfg.HostProjectDir != "" {
if !filepath.IsAbs(s.cfg.HostProjectDir) {
return "", "", fmt.Errorf("FONU_UPDATE_HOST_DIR 必须是绝对路径")
}
return s.cfg.HostProjectDir, filepath.Join(s.cfg.HostProjectDir, filepath.Base(s.cfg.ComposeFile)), nil
}
workingDir, _ := s.dockerLabel(ctx, "com.docker.compose.project.working_dir")
configFiles, _ := s.dockerLabel(ctx, "com.docker.compose.project.config_files")
hostDir := strings.TrimSpace(workingDir)
hostCompose := chooseComposeFile(configFiles, filepath.Base(s.cfg.ComposeFile))
if hostCompose == "" {
return "", "", fmt.Errorf("无法从容器标签读取 Compose 文件")
}
if hostDir == "" {
hostDir = filepath.Dir(hostCompose)
}
if !filepath.IsAbs(hostDir) || !filepath.IsAbs(hostCompose) {
return "", "", fmt.Errorf("容器标签中的 Compose 路径不是绝对路径")
}
return filepath.Clean(hostDir), filepath.Clean(hostCompose), nil
}
func (s *Server) dockerLabel(ctx context.Context, label string) (string, error) {
format := fmt.Sprintf(`{{ index .Config.Labels %q }}`, label)
checkCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
output, err := runCommand(checkCtx, "", nil, "docker", "inspect", "--format", format, s.cfg.Service)
if err != nil {
return fmt.Errorf("找不到 Compose 文件 %s；请确认 updater 的 /workspace 挂载，或在 .env 设置 FONU_UPDATE_HOST_DIR 指向 Compose 所在目录", s.composePath)
return "", err
}
if info.IsDir() {
return fmt.Errorf("Compose 路径是目录而不是文件：%s", s.composePath)
return strings.TrimSpace(output), nil
}
func chooseComposeFile(configFiles, expectedBase string) string {
for _, item := range strings.Split(configFiles, ",") {
path := strings.TrimSpace(item)
if path == "" {
continue
}
if filepath.Base(path) == expectedBase {
return path
}
}
return nil
for _, item := range strings.Split(configFiles, ",") {
if path := strings.TrimSpace(item); path != "" {
return path
}
}
return ""
}
func helperComposePath(hostDir, hostCompose string) (string, error) {
rel, err := filepath.Rel(hostDir, hostCompose)
if err != nil {
return "", err
}
if rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
return "", fmt.Errorf("Compose 文件不在宿主机项目目录内")
}
return filepath.Join("/workspace", rel), nil
}
// Status 返回当前版本、远端版本和任务状态。
@@ -182,7 +278,7 @@ func (s *Server) Status(ctx context.Context) Status {
return status
}
s.mu.Unlock()
if err := s.ensureComposeFile(); err != nil {
if err := s.ensureComposeFile(ctx); err != nil {
s.mu.Lock()
defer s.mu.Unlock()
s.state.UpdateAvailable = false
internal/updater/server_test.go
+26 -2
View File
@@ -1,6 +1,7 @@
package updater
import (
"context"
"os"
"path/filepath"
"testing"
@@ -49,14 +50,37 @@ func TestEnsureComposeFile(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := server.ensureComposeFile(); err == nil {
if err := server.ensureComposeFile(context.Background()); err == nil {
t.Fatal("缺少 compose 文件时应返回错误")
}
path := filepath.Join(dir, "docker-compose.yml")
if err := os.WriteFile(path, []byte("services: {}\n"), 0o600); err != nil {
t.Fatal(err)
}
if err := server.ensureComposeFile(); err != nil {
if err := server.ensureComposeFile(context.Background()); err != nil {
t.Fatalf("存在 compose 文件时不应报错: %v", err)
}
}
func TestResolveComposePlanUsesHostProjectDir(t *testing.T) {
containerDir := t.TempDir()
hostDir := t.TempDir()
server, err := NewServer(Config{
ProjectDir: containerDir,
ComposeFile: "docker-compose.hub.yml",
HostProjectDir: hostDir,
}, nil)
if err != nil {
t.Fatal(err)
}
plan, err := server.resolveComposePlan(context.Background())
if err != nil {
t.Fatal(err)
}
if !plan.helper {
t.Fatal("容器内看不到 Compose 文件时应使用 helper 模式")
}
if plan.helperComposePath != filepath.Join("/workspace", "docker-compose.hub.yml") {
t.Fatalf("helper compose 路径不正确: %s", plan.helperComposePath)
}
}