fix(deploy): 修复 Host Updater Compose 项目隔离
This commit is contained in:
@@ -264,16 +264,22 @@ func (m *Manager) compose(composePath, imageTag string, timeout time.Duration, s
|
||||
func (m *Manager) composeWithImages(composePath, imageTag string, images deploymentImages, timeout time.Duration, stdout io.Writer, arguments ...string) error {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||
defer cancel()
|
||||
args := []string{"compose", "--env-file", m.envPath(), "-f", composePath}
|
||||
envFile := m.envPath()
|
||||
if images.backend != "" {
|
||||
var err error
|
||||
envFile, err = m.writeComposeEnvOverride(images)
|
||||
if err != nil {
|
||||
return fmt.Errorf("准备目标 Compose 环境:%w", err)
|
||||
}
|
||||
defer os.Remove(envFile)
|
||||
}
|
||||
args := []string{"compose", "--project-name", composeProjectName(m.config.InstallDir), "--env-file", envFile, "-f", composePath}
|
||||
args = append(args, arguments...)
|
||||
var stderr bytes.Buffer
|
||||
if stdout == nil {
|
||||
stdout = io.Discard
|
||||
}
|
||||
environment := []string{"CANVAS_IMAGE_TAG=" + strings.TrimPrefix(imageTag, "v")}
|
||||
if images.backend != "" {
|
||||
environment = append(environment, "CANVAS_BACKEND_IMAGE="+images.backend, "CANVAS_WEB_IMAGE="+images.web)
|
||||
}
|
||||
err := m.runner.Run(ctx, "docker", args, environment, stdout, &stderr)
|
||||
if err != nil {
|
||||
message := strings.TrimSpace(stderr.String())
|
||||
@@ -288,6 +294,44 @@ func (m *Manager) composeWithImages(composePath, imageTag string, images deploym
|
||||
return nil
|
||||
}
|
||||
|
||||
func composeProjectName(installDir string) string {
|
||||
name := filepath.Base(filepath.Clean(installDir))
|
||||
if name == "." || name == string(filepath.Separator) || name == "" {
|
||||
return "open-ai-canvas"
|
||||
}
|
||||
var builder strings.Builder
|
||||
for _, char := range strings.ToLower(name) {
|
||||
if (char >= 'a' && char <= 'z') || (char >= '0' && char <= '9') || char == '-' || char == '_' {
|
||||
builder.WriteRune(char)
|
||||
}
|
||||
}
|
||||
if result := strings.Trim(builder.String(), "-_ "); result != "" {
|
||||
return result
|
||||
}
|
||||
return "open-ai-canvas"
|
||||
}
|
||||
|
||||
func (m *Manager) writeComposeEnvOverride(images deploymentImages) (string, error) {
|
||||
data, err := os.ReadFile(m.envPath())
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
path := filepath.Join(m.config.StateDir, ".compose-env-override-"+randomID())
|
||||
if err := os.WriteFile(path, data, 0o600); err != nil {
|
||||
return "", err
|
||||
}
|
||||
cleanup := func() { _ = os.Remove(path) }
|
||||
if err := setEnvValue(path, "CANVAS_BACKEND_IMAGE", images.backend); err != nil {
|
||||
cleanup()
|
||||
return "", err
|
||||
}
|
||||
if err := setEnvValue(path, "CANVAS_WEB_IMAGE", images.web); err != nil {
|
||||
cleanup()
|
||||
return "", err
|
||||
}
|
||||
return path, nil
|
||||
}
|
||||
|
||||
func (m *Manager) verifyImages(targetVersion string) (deploymentImages, error) {
|
||||
images := immutableImageRefs(m.config.Repository, targetVersion)
|
||||
refs := []string{images.backend, images.web}
|
||||
|
||||
@@ -146,3 +146,43 @@ func TestCheckWritableDirectory(t *testing.T) {
|
||||
t.Fatal("missing directory was accepted")
|
||||
}
|
||||
}
|
||||
|
||||
func TestComposeProjectNameUsesInstallDirectory(t *testing.T) {
|
||||
cases := map[string]string{
|
||||
"/opt/yingce": "yingce",
|
||||
"/srv/Open AI Canvas_2": "openaicanvas_2",
|
||||
"/": "open-ai-canvas",
|
||||
"/srv/!!!": "open-ai-canvas",
|
||||
}
|
||||
for installDir, want := range cases {
|
||||
if got := composeProjectName(installDir); got != want {
|
||||
t.Errorf("composeProjectName(%q) = %q, want %q", installDir, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestWriteComposeEnvOverrideReplacesImageRefs(t *testing.T) {
|
||||
installDir := t.TempDir()
|
||||
stateDir := filepath.Join(installDir, "state")
|
||||
if err := os.MkdirAll(stateDir, 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
envPath := filepath.Join(installDir, ".env")
|
||||
if err := os.WriteFile(envPath, []byte("CANVAS_BACKEND_IMAGE=old-backend\nCANVAS_WEB_IMAGE=old-web\nPOSTGRES_DB=canvas\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
manager := &Manager{config: Config{InstallDir: installDir, EnvFile: ".env", StateDir: stateDir}}
|
||||
path, err := manager.writeComposeEnvOverride(deploymentImages{backend: "new-backend", web: "new-web"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer os.Remove(path)
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
value := string(data)
|
||||
if !strings.Contains(value, "CANVAS_BACKEND_IMAGE=new-backend\n") || !strings.Contains(value, "CANVAS_WEB_IMAGE=new-web\n") || !strings.Contains(value, "POSTGRES_DB=canvas\n") {
|
||||
t.Fatalf("unexpected override env: %q", value)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user