Merge pull request #264 from ndeloof/env_priority

Author: ndeloof

cli/options.go

@@ -170,6 +170,9 @@ func WithLoadOptions(loadOptions ...func(*loader.Options)) ProjectOptionsFn {
 // WithOsEnv imports environment variables from OS
 func WithOsEnv(o *ProjectOptions) error {
 	for k, v := range getAsEqualsMap(os.Environ()) {
+		if _, set := o.Environment[k]; set {
+			continue
+		}
 		o.Environment[k] = v
 	}
 	return nil
@@ -239,6 +242,9 @@ func WithDotEnv(o *ProjectOptions) error {
 		if _, ok := notInEnvSet[k]; ok {
 			continue
 		}
+		if _, set := o.Environment[k]; set {
+			continue
+		}
 		o.Environment[k] = v
 	}
 	return nil