tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-12 10:58:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: set PWD only if not set

Browse Source 
Signed-off-by: Kian Eliasi <kian.elbo@gmail.com>
This commit is contained in:
Kian Eliasi 2025-10-08 10:23:30 +03:30 committed by Nicolas De loof
parent fa7e85ed83
commit ce463d50b2
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/compose/compose.go
View File

@ -383,18 +383,21 @@ func (o *ProjectOptions) remoteLoaders(dockerCli command.Cli) []loader.ResourceL
} }
func (o *ProjectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.ProjectOptions, error) { func (o *ProjectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.ProjectOptions, error) {
pwd, err := os.Getwd() opts := []cli.ProjectOptionsFn{
if err != nil {
return nil, err
}
return cli.NewProjectOptions(o.ConfigPaths,
append(po,
cli.WithWorkingDirectory(o.ProjectDir), cli.WithWorkingDirectory(o.ProjectDir),
// First apply os.Environment, always win // First apply os.Environment, always win
cli.WithOsEnv, cli.WithOsEnv,
// set PWD as this variable is not consistently supported on Windows }
cli.WithEnv([]string{"PWD=" + pwd}),
if _, present := os.LookupEnv("PWD"); !present {
if pwd, err := os.Getwd(); err != nil {
return nil, err
} else {
opts = append(opts, cli.WithEnv([]string{"PWD=" + pwd}))
}
}
opts = append(opts,
// Load PWD/.env if present and no explicit --env-file has been set // Load PWD/.env if present and no explicit --env-file has been set
cli.WithEnvFiles(o.EnvFiles...), cli.WithEnvFiles(o.EnvFiles...),
// read dot env file to populate project environment // read dot env file to populate project environment
@ -408,7 +411,10 @@ func (o *ProjectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.Proj
cli.WithDotEnv, cli.WithDotEnv,
// eventually COMPOSE_PROFILES should have been set // eventually COMPOSE_PROFILES should have been set
cli.WithDefaultProfiles(o.Profiles...), cli.WithDefaultProfiles(o.Profiles...),
cli.WithName(o.ProjectName))...) cli.WithName(o.ProjectName),
)
return cli.NewProjectOptions(o.ConfigPaths, append(po, opts...)...)
} }
// PluginName is the name of the plugin // PluginName is the name of the plugin