silva
/
compose
mirror of https://github.com/viniciusfdasilva/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1328 from docker/env_vs_dot_env 

os ENV has precedence over env file
This commit is contained in:
Nicolas De loof 2021-02-22 10:01:40 +01:00 committed by GitHub
parent 598f7bba1f 8525ac44ed
commit 134b55b512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cmd/compose/compose.go
View File

@ -83,9 +83,9 @@ func (o *projectOptions) toProject(services []string) (*types.Project, error) {
func (o *projectOptions) toProjectOptions() (*cli.ProjectOptions, error) { func (o *projectOptions) toProjectOptions() (*cli.ProjectOptions, error) {
return cli.NewProjectOptions(o.ConfigPaths, return cli.NewProjectOptions(o.ConfigPaths,
cli.WithOsEnv,
cli.WithEnvFile(o.EnvFile), cli.WithEnvFile(o.EnvFile),
cli.WithDotEnv, cli.WithDotEnv,
cli.WithOsEnv,
cli.WithWorkingDirectory(o.WorkingDir), cli.WithWorkingDirectory(o.WorkingDir),
cli.WithName(o.ProjectName)) cli.WithName(o.ProjectName))
} }