JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

imageutil: avoid pulling unwanted manifests 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2017-12-12 13:42:27 -08:00
parent 60ea0babb5
commit d0f8125af9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
util/imageutil/config.go
View File

@ -56,7 +56,7 @@ func Config(ctx context.Context, str string, resolver remotes.Resolver, ingester
handlers := []images.Handler{
remotes.FetchHandler(ingester, fetcher),
childrenConfigHandler(ingester),
childrenConfigHandler(ingester, platforms.Default()),
}
if err := images.Dispatch(ctx, images.Handlers(handlers...), *desc); err != nil {
return "", nil, err
@ -74,7 +74,7 @@ func Config(ctx context.Context, str string, resolver remotes.Resolver, ingester
return desc.Digest, dt, nil
}
func childrenConfigHandler(provider content.Provider) images.HandlerFunc {
func childrenConfigHandler(provider content.Provider, platform string) images.HandlerFunc {
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
var descs []ocispec.Descriptor
switch desc.MediaType {
@ -103,7 +103,20 @@ func childrenConfigHandler(provider content.Provider) images.HandlerFunc {
return nil, err
}
descs = append(descs, index.Manifests...)
if platform != "" {
matcher, err := platforms.Parse(platform)
if err != nil {
return nil, err
}
for _, d := range index.Manifests {
if d.Platform == nil || matcher.Match(*d.Platform) {
descs = append(descs, d)
}
}
} else {
descs = append(descs, index.Manifests...)
}
case images.MediaTypeDockerSchema2Config, ocispec.MediaTypeImageConfig:
// childless data types.
return nil, nil