InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 10:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor containerd platform matchers.

Browse Source 
Merge the matchAllWithPreference matcher into the matchAnyWithPreference
matcher to reduce code duplication and simplify the code.

Signed-off-by: Cesar Talledo <cesar.talledo@docker.com>
This commit is contained in:
Cesar Talledo
2025-06-13 11:51:31 -07:00
committed by Sebastiaan van Stijn
parent fcc8209e12
commit b91ebbde6d
3 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon/containerd/image_exporter.go
View File

@@ -32,14 +32,8 @@ import (
//
// TODO(thaJeztah): produce JSON stream progress response and image events; see https://github.com/moby/moby/issues/43910
func (i *ImageService) ExportImage(ctx context.Context, names []string, platformList []ocispec.Platform, outStream io.Writer) error {
var pm platforms.MatchComparer
// Get the platform matcher for the requested platforms
if len(platformList) == 0 {
pm = matchAllWithPreference(i.hostPlatformMatcher())
} else {
pm = matchAnyWithPreference(i.hostPlatformMatcher(), platformList)
}
// Get the platform matcher for the requested platforms (matches all platforms if none specified)
pm := matchAnyWithPreference(i.hostPlatformMatcher(), platformList)
opts := []archive.ExportOpt{
archive.WithSkipNonDistributableBlobs(),
@@ -249,14 +243,8 @@ func (i *ImageService) LoadImage(ctx context.Context, inTar io.ReadCloser, platf
specificPlatforms := len(platformList) > 0
// Get the platform matcher for the requested platforms
var pm platforms.MatchComparer
if specificPlatforms {
pm = platforms.Any(platformList...)
} else {
// All platforms
pm = matchAllWithPreference(i.hostPlatformMatcher())
}
// Get the platform matcher for the requested platforms (matches all platforms if none specified)
pm := matchAnyWithPreference(i.hostPlatformMatcher(), platformList)
opts := []containerd.ImportOpt{
containerd.WithImportPlatform(pm),

2
daemon/containerd/image_list.go
View File

@@ -114,7 +114,7 @@ func (i *ImageService) Images(ctx context.Context, opts imagetypes.ListOptions)
}
// TODO: Allow platform override?
platformMatcher := matchAllWithPreference(platforms.Default())
platformMatcher := matchAnyWithPreference(platforms.Default(), nil)
for _, img := range imgs {
isDangling := isDanglingImage(img)

34
daemon/containerd/platform_matchers.go
View File

@@ -5,29 +5,9 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
// allPlatformsWithPreferenceMatcher returns a platform matcher that matches all
// platforms but orders platforms to match the preferred matcher first.
// It implements the platforms.MatchComparer interface.
type allPlatformsWithPreferenceMatcher struct {
preferred platforms.MatchComparer
}
func matchAllWithPreference(preferred platforms.MatchComparer) allPlatformsWithPreferenceMatcher {
return allPlatformsWithPreferenceMatcher{
preferred: preferred,
}
}
func (c allPlatformsWithPreferenceMatcher) Match(_ ocispec.Platform) bool {
return true
}
func (c allPlatformsWithPreferenceMatcher) Less(p1, p2 ocispec.Platform) bool {
return c.preferred.Less(p1, p2)
}
// platformsWithPreferenceMatcher is a platform matcher that matches any of the
// given platforms, but orders platforms to match the preferred matcher first.
// platforms in the platformList, but orders platforms to match the preferred matcher
// first. If the platformList is empty, it matches all platforms.
// It implements the platforms.MatchComparer interface.
type platformsWithPreferenceMatcher struct {
platformList []ocispec.Platform
@@ -42,6 +22,9 @@ func matchAnyWithPreference(preferred platforms.MatchComparer, platformList []oc
}
func (c platformsWithPreferenceMatcher) Match(p ocispec.Platform) bool {
if len(c.platformList) == 0 {
return true
}
return platforms.Any(c.platformList...).Match(p)
}
@@ -60,14 +43,16 @@ type platformMatcherWithRequestedPlatform struct {
type matchComparerProvider func(ocispec.Platform) platforms.MatchComparer
// TODO(ctalledo): move this to a more appropriate place (e.g., next to the other ImageService methods).
// matchRequestedOrDefault returns a platform match comparer that matches the given platform
// using the given match comparer. If no platform is given, matches any platform with
// preference for the host platform.
func (i *ImageService) matchRequestedOrDefault(
fpm matchComparerProvider, // function to create a platform matcher if platform is not nil
platform *ocispec.Platform, // input platform, nil if not specified
) platformMatcherWithRequestedPlatform {
var inner platforms.MatchComparer
if platform == nil {
inner = matchAllWithPreference(i.hostPlatformMatcher())
inner = matchAnyWithPreference(i.hostPlatformMatcher(), nil)
} else {
inner = fpm(*platform)
}
@@ -78,6 +63,7 @@ func (i *ImageService) matchRequestedOrDefault(
}
}
// hostPlatformMatcher returns a platform match comparer that matches the host platform.
func (i *ImageService) hostPlatformMatcher() platforms.MatchComparer {
// Allow to override the host platform for testing purposes.
if i.defaultPlatformOverride != nil {