Merge pull request #3322 from ndeloof/validateComposeFile

crazy-max · web-flow · commit dcd113370e90 · 2025-07-21T09:33:12.000+02:00
do not assume input is a compose file on .env parsing error
diff --git a/bake/compose.go b/bake/compose.go
@@ -259,7 +259,7 @@ func loadComposeFiles(cfgs []composetypes.ConfigFile, envs map[string]string, op
 func validateComposeFile(dt []byte, fn string) (bool, error) {
 	envs, err := composeEnv()
 	if err != nil {
-		return true, err
+		return false, err
 	}
 	fnl := strings.ToLower(fn)
 	if strings.HasSuffix(fnl, ".yml") || strings.HasSuffix(fnl, ".yaml") {

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ func loadComposeFiles(cfgs []composetypes.ConfigFile, envs map[string]string, op`
`259`	`259`	`func validateComposeFile(dt []byte, fn string) (bool, error) {`
`260`	`260`	`envs, err := composeEnv()`
`261`	`261`	`if err != nil {`
`262`		`- return true, err`
	`262`	`+ return false, err`
`263`	`263`	`}`
`264`	`264`	`fnl := strings.ToLower(fn)`
`265`	`265`	`if strings.HasSuffix(fnl, ".yml") \|\| strings.HasSuffix(fnl, ".yaml") {`