fix(updater): 修复 Compose 文件挂载并发布 v1.3.4
This commit is contained in:
@@ -22,6 +22,9 @@ func (s *Server) runUpdate(ctx context.Context) error {
|
||||
s.state.Phase = PhaseRunning
|
||||
s.state.Message = "正在准备升级"
|
||||
s.mu.Unlock()
|
||||
if err := s.ensureComposeFile(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
latest, err := s.latestVersion(ctx)
|
||||
if err != nil {
|
||||
|
||||
@@ -162,6 +162,17 @@ func (s *Server) handleApply(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusAccepted, status)
|
||||
}
|
||||
|
||||
func (s *Server) ensureComposeFile() error {
|
||||
info, err := os.Stat(s.composePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("找不到 Compose 文件 %s;请确认 updater 的 /workspace 挂载,或在 .env 设置 FONU_UPDATE_HOST_DIR 指向 Compose 所在目录", s.composePath)
|
||||
}
|
||||
if info.IsDir() {
|
||||
return fmt.Errorf("Compose 路径是目录而不是文件:%s", s.composePath)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Status 返回当前版本、远端版本和任务状态。
|
||||
func (s *Server) Status(ctx context.Context) Status {
|
||||
s.mu.Lock()
|
||||
@@ -170,6 +181,16 @@ func (s *Server) Status(ctx context.Context) Status {
|
||||
s.mu.Unlock()
|
||||
return status
|
||||
}
|
||||
s.mu.Unlock()
|
||||
if err := s.ensureComposeFile(); err != nil {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
s.state.UpdateAvailable = false
|
||||
s.state.Message = err.Error()
|
||||
s.state.CheckedAt = time.Now().UTC().Format(time.RFC3339)
|
||||
return cloneStatus(s.state)
|
||||
}
|
||||
s.mu.Lock()
|
||||
if !s.lastChecked.IsZero() && time.Since(s.lastChecked) < time.Minute {
|
||||
status := cloneStatus(s.state)
|
||||
s.mu.Unlock()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package updater
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
@@ -41,3 +42,21 @@ func TestNewServerDefaultsAndValidation(t *testing.T) {
|
||||
t.Fatal("git 模式缺少 RepoURL 应被拒绝")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureComposeFile(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
server, err := NewServer(Config{ProjectDir: dir, ComposeFile: "docker-compose.yml"}, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := server.ensureComposeFile(); 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 {
|
||||
t.Fatalf("存在 compose 文件时不应报错: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user