dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-06-30 19:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

containerimage: preserve local fallback for default image resolution

Browse Source 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2026-05-07 17:50:19 +02:00
parent eb866c3d23
commit ca9bcf049c
3 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/containerimage/source.go
View File

@@ -189,7 +189,18 @@ func (is *Source) ResolveImageMetadata(ctx context.Context, id *ImageIdentifier,
res, err := is.gImageRes.Do(ctx, key, func(ctx context.Context) (*resolveImageResult, error) {
dgst, dt, err := imageutil.Config(ctx, ref, rslvr, is.ContentStore, is.LeaseManager, opt.Platform)
if err != nil {
return nil, err
if rm != resolver.ResolveModeDefault || is.ImageStore == nil {
return nil, err
}
localRslvr := rslvr.WithImageStore(is.ImageStore, resolver.ResolveModePreferLocal)
if _, _, localErr := localRslvr.ResolveLocal(ctx, ref); localErr != nil {
return nil, err
}
localDgst, localDt, localErr := imageutil.Config(ctx, ref, localRslvr, is.ContentStore, is.LeaseManager, opt.Platform)
if localErr != nil {
return nil, err
}
dgst, dt = localDgst, localDt
}
return &resolveImageResult{dgst: dgst, dt: dt}, nil
})