Merge pull request #8819 from ulyssessouza/dotenv-wrkdir-order

Fix project settings' options order
docker · Oct 23, 2021 · 6476e10 · 6476e10
2 parents d38a315 + 2530bd9
commit 6476e10
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go
@@ -199,10 +199,10 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
 func (o *projectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.ProjectOptions, error) {
 	return cli.NewProjectOptions(o.ConfigPaths,
 		append(po,
+			cli.WithWorkingDirectory(o.ProjectDir),
 			cli.WithEnvFile(o.EnvFile),
 			cli.WithDotEnv,
 			cli.WithOsEnv,
-			cli.WithWorkingDirectory(o.ProjectDir),
 			cli.WithConfigFileEnv,
 			cli.WithDefaultConfigPath,
 			cli.WithName(o.ProjectName))...)