mirror of
https://github.com/docker/compose.git
synced 2025-07-23 21:54:40 +02:00
Merge pull request #1328 from docker/env_vs_dot_env
os ENV has precedence over env file
This commit is contained in:
commit
134b55b512
@ -83,9 +83,9 @@ func (o *projectOptions) toProject(services []string) (*types.Project, error) {
|
||||
|
||||
func (o *projectOptions) toProjectOptions() (*cli.ProjectOptions, error) {
|
||||
return cli.NewProjectOptions(o.ConfigPaths,
|
||||
cli.WithOsEnv,
|
||||
cli.WithEnvFile(o.EnvFile),
|
||||
cli.WithDotEnv,
|
||||
cli.WithOsEnv,
|
||||
cli.WithWorkingDirectory(o.WorkingDir),
|
||||
cli.WithName(o.ProjectName))
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user