github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2936 from estesp/post-2622-cleanups

Browse Source 
Handle additional cleanups from prior PR
This commit is contained in:
Michael Crosby
2019-01-17 11:58:42 -05:00
committed by GitHub
parent df97414a77 b444d7d507
commit 3acf6f1835
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
images/oci/exporter.go
View File

@@ -41,7 +41,7 @@ type V1Exporter struct {
AllPlatforms bool
}
// V1ExporterOpt allows to set additional options to a newly V1Exporter
// V1ExporterOpt allows the caller to set additional options to a new V1Exporter
type V1ExporterOpt func(c *V1Exporter) error
// DefaultV1Exporter return a default V1Exporter pointer
@@ -91,11 +91,7 @@ func (oe *V1Exporter) Export(ctx context.Context, store content.Provider, desc o
if !oe.AllPlatforms {
// get local default platform to fetch image manifest
p, err := platforms.Parse(platforms.DefaultString())
if err != nil {
return errors.Wrapf(err, "invalid platform %s", platforms.DefaultString())
}
childrenHandler = images.FilterPlatforms(childrenHandler, platforms.Any(p))
childrenHandler = images.FilterPlatforms(childrenHandler, platforms.Any(platforms.DefaultSpec()))
}
handlers := images.Handlers(