dockerfile: normalize platform in image config

tonistiigi · crazy-max · commit 2c40436cbb14 · 2025-03-04T22:58:51.000+01:00
Base image may use unnormalized platform so if platform
is inherited normalize needs to be called again.

Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -815,6 +815,7 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS
 			target.image.OSFeatures = append([]string{}, platformOpt.targetPlatform.OSFeatures...)
 		}
 	}
+	target.image.Platform = platforms.Normalize(target.image.Platform)
 
 	return target, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -815,6 +815,7 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS`
`815`	`815`	`target.image.OSFeatures = append([]string{}, platformOpt.targetPlatform.OSFeatures...)`
`816`	`816`	`}`
`817`	`817`	`}`
	`818`	`+ target.image.Platform = platforms.Normalize(target.image.Platform)`
`818`	`819`
`819`	`820`	`return target, nil`
`820`	`821`	`}`