Merge pull request moby#4987 from tonistiigi/df-base-verify-reachable

tonistiigi · web-flow · commit 3d789eb740a9 · 2024-06-03T12:39:14.000-07:00
dockerfile: make sure stage is reachable before validating base
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -601,7 +601,9 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS
 							llb.WithCustomName(prefixCommand(d, "FROM "+d.stage.BaseName, opt.MultiPlatformRequested, platform, nil)),
 							location(opt.SourceMap, d.stage.Location),
 						)
-						validateBaseImagePlatform(origName, *platform, d.image.Platform, d.stage.Location, lint)
+						if reachable {
+							validateBaseImagePlatform(origName, *platform, d.image.Platform, d.stage.Location, lint)
+						}
 					}
 					d.platform = platform
 					return nil

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,9 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS`
`601`	`601`	`llb.WithCustomName(prefixCommand(d, "FROM "+d.stage.BaseName, opt.MultiPlatformRequested, platform, nil)),`
`602`	`602`	`location(opt.SourceMap, d.stage.Location),`
`603`	`603`	`)`
`604`		`- validateBaseImagePlatform(origName, *platform, d.image.Platform, d.stage.Location, lint)`
	`604`	`+ if reachable {`
	`605`	`+ validateBaseImagePlatform(origName, *platform, d.image.Platform, d.stage.Location, lint)`
	`606`	`+ }`
`605`	`607`	`}`
`606`	`608`	`d.platform = platform`
`607`	`609`	`return nil`