Do not export an empty to path to a windows image config

mendsley · mendsley · commit d4e6655ab072 · 2024-09-11T13:12:02.000-07:00
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -627,7 +627,9 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS
 			if d.platform != nil {
 				osName = d.platform.OS
 			}
-			d.image.Config.Env = append(d.image.Config.Env, "PATH="+system.DefaultPathEnv(osName))
+			if p := system.DefaultPathEnv(osName); p != "" {
+				d.image.Config.Env = append(d.image.Config.Env, "PATH="+p)
+			}
 		}
 
 		// initialize base metadata from image conf

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,9 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS`
`627`	`627`	`if d.platform != nil {`
`628`	`628`	`osName = d.platform.OS`
`629`	`629`	`}`
`630`		`- d.image.Config.Env = append(d.image.Config.Env, "PATH="+system.DefaultPathEnv(osName))`
	`630`	`+ if p := system.DefaultPathEnv(osName); p != "" {`
	`631`	`+ d.image.Config.Env = append(d.image.Config.Env, "PATH="+p)`
	`632`	`+ }`
`631`	`633`	`}`
`632`	`634`
`633`	`635`	`// initialize base metadata from image conf`