Merge pull request #193 from compose-spec/ignore-dotenv-dir

ndeloof · web-flow · commit ad6e42f68193 · 2021-09-30T06:33:38.000+02:00
diff --git a/cli/options.go b/cli/options.go
@@ -206,9 +206,10 @@ func WithDotEnv(o *ProjectOptions) error {
 	}
 
 	if s.IsDir() {
-		if o.EnvFile != "" {
-			return errors.Errorf("%s is a directory", dotEnvFile)
+		if o.EnvFile == "" {
+			return nil
 		}
+		return errors.Errorf("%s is a directory", dotEnvFile)
 	}
 
 	file, err := os.Open(dotEnvFile)

Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,10 @@ func WithDotEnv(o *ProjectOptions) error {`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`if s.IsDir() {`
`209`		`- if o.EnvFile != "" {`
`210`		`- return errors.Errorf("%s is a directory", dotEnvFile)`
	`209`	`+ if o.EnvFile == "" {`
	`210`	`+ return nil`
`211`	`211`	`}`
	`212`	`+ return errors.Errorf("%s is a directory", dotEnvFile)`
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`file, err := os.Open(dotEnvFile)`