Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: project env interpolation not parsing env files in correct order (#751)
Kyle Mendellba90d5173bba
diff --git a/backend/internal/utils/projects/env.go b/backend/internal/utils/projects/env.goindex b22f40f5b..e55390423 100644--- a/backend/internal/utils/projects/env.go+++ b/backend/internal/utils/projects/env.go@@ -1,7 +1,6 @@package projectsimport (- "bufio""context""fmt""log/slog"@@ -9,6 +8,8 @@ import ("path/filepath""strings""time"++ "github.com/compose-spec/compose-go/v2/dotenv")const filePerm = 0644@@ -62,6 +63,29 @@ func (l *EnvLoader) LoadEnvironment(ctx context.Context) (envMap EnvMap, injectireturn envMap, injectionVars, nil}+// LoadGlobalEnvironment loads only global environment variables:+// 1. Process environment+// 2. Global .env.global file (from projects directory)+// This allows compose-go to load project-specific .env files and do interpolation+func (l *EnvLoader) LoadGlobalEnvironment(ctx context.Context) (envMap EnvMap, injectionVars EnvMap, err error) {+ envMap = l.loadProcessEnv()+ injectionVars = make(EnvMap)++ globalEnvPath := filepath.Join(l.projectsDir, globalEnvFileName)+ if err := l.ensureGlobalEnvFile(ctx, globalEnvPath); err != nil {+ slog.WarnContext(ctx, "Failed to ensure global env file", "path", globalEnvPath, "error", err)+ }++ if err := l.loadAndMergeGlobalEnv(ctx, globalEnvPath, envMap, injectionVars); err != nil {+ slog.WarnContext(ctx, "Failed to load global env", "path", globalEnvPath, "error", err)+ }++ // Note: Project-specific .env file is NOT loaded here+ // compose-go loader will load it automatically and handle interpolation++ return envMap, injectionVars, nil+}+func (l *EnvLoader) loadProcessEnv() EnvMap {envMap := make(EnvMap)for _, kv := range os.Environ() {@@ -108,7 +132,7 @@ func (l *EnvLoader) loadAndMergeGlobalEnv(ctx context.Context, path string, envMslog.DebugContext(ctx, "Found global env file", "path", path)- globalEnv, err := parseEnvFile(path)+ globalEnv, err := parseEnvFileWithContext(path, envMap)if err != nil {return fmt.Errorf("parse env file: %w", err)}@@ -145,7 +169,7 @@ func (l *EnvLoader) loadAndMergeProjectEnv(ctx context.Context, path string, envslog.DebugContext(ctx, "Found project .env file", "path", path)- projectEnv, err := parseEnvFile(path)+ projectEnv, err := parseEnvFileWithContext(path, envMap)if err != nil {return fmt.Errorf("parse env file: %w", err)}@@ -155,65 +179,37 @@ func (l *EnvLoader) loadAndMergeProjectEnv(ctx context.Context, path string, envfor k, v := range projectEnv {envMap[k] = vinjectionVars[k] = v+ slog.DebugContext(ctx, "Loaded env var from project .env", "key", k, "value", v)}slog.DebugContext(ctx, "Merged project .env into environment map", "total_env_count", len(envMap))return nil}-func parseEnvFile(path string) (EnvMap, error) {+// parseEnvFileWithContext parses an env file using compose-go's dotenv parser with variable expansion.+// The contextEnv map provides variables for expansion (e.g., from process env or previously loaded files).+// This handles ${VAR} syntax and proper quote handling automatically via compose-go's dotenv package.+func parseEnvFileWithContext(path string, contextEnv EnvMap) (EnvMap, error) {f, err := os.Open(path)if err != nil {return nil, fmt.Errorf("open file: %w", err)}defer f.Close()- envMap := make(EnvMap)- scanner := bufio.NewScanner(f)-- for scanner.Scan() {- line := strings.TrimSpace(scanner.Text())-- // Skip empty lines and comments- if line == "" || strings.HasPrefix(line, "#") {- continue+ // Create lookup function for variable expansion+ // Checks contextEnv first (previously loaded vars), then process environment+ lookupFn := func(key string) (string, bool) {+ if val, ok := contextEnv[key]; ok {+ return val, true}-- // Split on first '=' to get key and value- parts := strings.SplitN(line, "=", 2)- if len(parts) != 2 {- continue- }-- key := strings.TrimSpace(parts[0])- value := strings.TrimSpace(parts[1])-- // Strip surrounding quotes and unescape- value = stripQuotes(value)-- envMap[key] = value- }-- if err := scanner.Err(); err != nil {- return nil, fmt.Errorf("scan file: %w", err)- }-- return envMap, nil-}--func stripQuotes(value string) string {- if len(value) < 2 {- return value+ return os.LookupEnv(key)}- // Check for surrounding quotes (either double or single)- if (strings.HasPrefix(value, `"`) && strings.HasSuffix(value, `"`)) ||- (strings.HasPrefix(value, `'`) && strings.HasSuffix(value, `'`)) {- // Remove surrounding quotes- value = value[1 : len(value)-1]- // Unescape inner double-quotes- value = strings.ReplaceAll(value, `\"`, `"`)+ // Use compose-go's dotenv parser with lookup support for variable expansion+ envMap, err := dotenv.ParseWithLookup(f, lookupFn)+ if err != nil {+ return nil, fmt.Errorf("parse env file: %w", err)}- return value+ return EnvMap(envMap), nil}diff --git a/backend/internal/utils/projects/load.go b/backend/internal/utils/projects/load.goindex c0b71a346..55a77d91a 100644--- a/backend/internal/utils/projects/load.go+++ b/backend/internal/utils/projects/load.go@@ -46,17 +46,21 @@ func LoadComposeProject(ctx context.Context, composeFile, projectName, projectsD}envLoader := NewEnvLoader(projectsDir, workdir)- envMap, injectionVars, err := envLoader.LoadEnvironment(ctx)++ // Load full environment (process + global + project .env) for service injection+ fullEnvMap, injectionVars, err := envLoader.LoadEnvironment(ctx)if err != nil {slog.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 filecfg := composetypes.ConfigDetails{WorkingDir: workdir,ConfigFiles: []composetypes.ConfigFile{{Filename: composeFile},},- Environment: composetypes.Mapping(envMap),+ Environment: composetypes.Mapping(fullEnvMap),}project, err := loader.LoadWithContext(ctx, cfg, func(opts *loader.Options) {