Skip to content

Fix missing error handling in setEnvWithDotEnv #13450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glours merged 2 commits into from
Dec 15, 2025
+5 −5
Merged

Fix missing error handling in setEnvWithDotEnv #13450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3225c2f
Fix missing error handling in setEnvWithDotEnv
htoyoda18 Dec 14, 2025
e5c9e73
Avoid reassigning err variable
htoyoda18 Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/compose/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,20 +680,20 @@ func setEnvWithDotEnv(opts ProjectOptions) error {
cli.WithDotEnv,
)
if err != nil {
return nil
return err
}
envFromFile, err := dotenv.GetEnvFromFile(composegoutils.GetAsEqualsMap(os.Environ()), options.EnvFiles)
if err != nil {
return nil
return err
}
for k, v := range envFromFile {
if _, ok := os.LookupEnv(k); !ok && strings.HasPrefix(k, "COMPOSE_") {
if err = os.Setenv(k, v); err != nil {
return nil
if err := os.Setenv(k, v); err != nil {
return err
}
}
}
return err
return nil
}

var printerModes = []string{
Expand Down