Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: use correct PWD env variable (#941)
Kyle Mendelldc3c29de08cf
diff --git a/backend/internal/utils/projects/load.go b/backend/internal/utils/projects/load.goindex 55a77d91a..75955e98d 100644--- a/backend/internal/utils/projects/load.go+++ b/backend/internal/utils/projects/load.go@@ -53,8 +53,20 @@ func LoadComposeProject(ctx context.Context, composeFile, projectName, projectsDslog.WarnContext(ctx, "Failed to load environment", "error", err)}- // Pass full environment to compose-go for interpolation- // compose-go will use this for ${VAR} expansion in the compose file+ // Set PWD+ if absWorkdir, absErr := filepath.Abs(workdir); absErr == nil {+ fullEnvMap["PWD"] = absWorkdir+ } else {+ slog.WarnContext(ctx, "Failed to set PWD environment variable", "workdir", workdir, "error", absErr)+ }++ // Debug: Log all environment variables being passed to compose+ slog.DebugContext(ctx, "Environment variables for compose interpolation", "count", len(fullEnvMap))+ for k, v := range fullEnvMap {+ slog.DebugContext(ctx, "Env var", "key", k, "value", v)+ }++ // Pass full environment to compose-go for interpolation, compose-go will use this for ${VAR} expansion in the compose filecfg := composetypes.ConfigDetails{WorkingDir: workdir,ConfigFiles: []composetypes.ConfigFile{@@ -72,6 +84,9 @@ func LoadComposeProject(ctx context.Context, composeFile, projectName, projectsDproject = project.WithoutUnnecessaryResources()+ // Resolve relative paths for bind mounts, secrets, and configs+ resolveRelativeProjectPaths(project, workdir)+injectServiceConfiguration(project, injectionVars, workdir, composeFile)project.ComposeFiles = []string{composeFile}@@ -124,3 +139,52 @@ func LoadComposeProjectFromDir(ctx context.Context, dir, projectName, projectsDireturn proj, composeFile, nil}++func resolveRelativeProjectPaths(project *composetypes.Project, workdir string) {+ if project == nil || workdir == "" {+ return+ }++ for si := range project.Services {+ service := project.Services[si]+ for vi := range service.Volumes {+ volume := service.Volumes[vi]+ if volume.Type != composetypes.VolumeTypeBind {+ continue+ }+ if resolved, ok := resolvePathRelative(workdir, volume.Source); ok {+ volume.Source = resolved+ service.Volumes[vi] = volume+ }+ }+ project.Services[si] = service+ }++ for name, secret := range project.Secrets {+ if resolved, ok := resolvePathRelative(workdir, secret.File); ok {+ secret.File = resolved+ project.Secrets[name] = secret+ }+ }++ for name, config := range project.Configs {+ if resolved, ok := resolvePathRelative(workdir, config.File); ok {+ config.File = resolved+ project.Configs[name] = config+ }+ }+}++func resolvePathRelative(workdir, candidate string) (string, bool) {+ if candidate == "" {+ return candidate, false+ }+ if filepath.IsAbs(candidate) {+ return filepath.Clean(candidate), false+ }+ if workdir == "" {+ return candidate, false+ }+ resolved := filepath.Join(workdir, candidate)+ return filepath.Clean(resolved), true+}