Skip to content

Commit 6c04392

Browse files
htoyoda18glours
authored andcommitted
Fix missing error handling in setEnvWithDotEnv
Signed-off-by: hiroto.toyoda <[email protected]>
1 parent 2750330 commit 6c04392

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cmd/compose/compose.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,20 +680,20 @@ func setEnvWithDotEnv(opts ProjectOptions) error {
680680
cli.WithDotEnv,
681681
)
682682
if err != nil {
683-
return nil
683+
return err
684684
}
685685
envFromFile, err := dotenv.GetEnvFromFile(composegoutils.GetAsEqualsMap(os.Environ()), options.EnvFiles)
686686
if err != nil {
687-
return nil
687+
return err
688688
}
689689
for k, v := range envFromFile {
690690
if _, ok := os.LookupEnv(k); !ok && strings.HasPrefix(k, "COMPOSE_") {
691691
if err = os.Setenv(k, v); err != nil {
692-
return nil
692+
return err
693693
}
694694
}
695695
}
696-
return err
696+
return nil
697697
}
698698

699699
var printerModes = []string{

0 commit comments

Comments
 (0)