From 3225c2f1e3dc71d46ebc36da30649658819b7cf7 Mon Sep 17 00:00:00 2001 From: "hiroto.toyoda" Date: Mon, 15 Dec 2025 02:38:23 +0900 Subject: [PATCH 1/2] Fix missing error handling in setEnvWithDotEnv Signed-off-by: hiroto.toyoda --- cmd/compose/compose.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 2aad5472b1..ebdc32f3bb 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -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 + return err } } } - return err + return nil } var printerModes = []string{ From e5c9e73ca7d3565d29a4834369e47a8009b46e29 Mon Sep 17 00:00:00 2001 From: "hiroto.toyoda" Date: Mon, 15 Dec 2025 02:44:22 +0900 Subject: [PATCH 2/2] Avoid reassigning err variable Signed-off-by: hiroto.toyoda --- cmd/compose/compose.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index ebdc32f3bb..7796a1a6c2 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -688,7 +688,7 @@ func setEnvWithDotEnv(opts ProjectOptions) error { } for k, v := range envFromFile { if _, ok := os.LookupEnv(k); !ok && strings.HasPrefix(k, "COMPOSE_") { - if err = os.Setenv(k, v); err != nil { + if err := os.Setenv(k, v); err != nil { return err } }