kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

builder: fix platform passing in image adapter

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2019-03-15 19:07:41 -07:00
parent 0289aa436c
commit 8b0a1ca8a5
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
builder/builder-next/adapters/containerimage/pull.go
View file

@ -381,6 +381,7 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
return nil, err return nil, err
} }
platform := platforms.Only(p.platform)
var ( var (
schema1Converter *schema1.Converter schema1Converter *schema1.Converter
handlers []images.Handler handlers []images.Handler
@ -413,7 +414,9 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
// Set any children labels for that content // Set any children labels for that content
childrenHandler = images.SetChildrenLabels(p.is.ContentStore, childrenHandler) childrenHandler = images.SetChildrenLabels(p.is.ContentStore, childrenHandler)
// Filter the children by the platform // Filter the children by the platform
childrenHandler = images.FilterPlatforms(childrenHandler, platforms.Default()) childrenHandler = images.FilterPlatforms(childrenHandler, platform)
// Limit manifests pulled to the best match in an index
childrenHandler = images.LimitManifests(childrenHandler, platform, 1)
handlers = append(handlers, handlers = append(handlers,
remotes.FetchHandler(p.is.ContentStore, fetcher), remotes.FetchHandler(p.is.ContentStore, fetcher),
@ -434,12 +437,12 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
} }
} }
mfst, err := images.Manifest(ctx, p.is.ContentStore, p.desc, platforms.Default()) mfst, err := images.Manifest(ctx, p.is.ContentStore, p.desc, platform)
if err != nil { if err != nil {
return nil, err return nil, err
} }
config, err := images.Config(ctx, p.is.ContentStore, p.desc, platforms.Default()) config, err := images.Config(ctx, p.is.ContentStore, p.desc, platform)
if err != nil { if err != nil {
return nil, err return nil, err
} }