From 9083769a6e55984a2742f7d13dd01f4630bdc92b Mon Sep 17 00:00:00 2001 From: John Stephens Date: Fri, 6 Oct 2017 22:19:06 -0700 Subject: [PATCH] Stop filtering Windows manifest lists by version Signed-off-by: John Stephens (cherry picked from commit 8ed8f4a71d7e1a936fa077b4348b7375c81746a6) Conflicts: components/engine/distribution/pull_v2_windows.go Signed-off-by: John Stephens --- .../engine/distribution/pull_v2_windows.go | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/components/engine/distribution/pull_v2_windows.go b/components/engine/distribution/pull_v2_windows.go index e94109484d..76b6f270d1 100644 --- a/components/engine/distribution/pull_v2_windows.go +++ b/components/engine/distribution/pull_v2_windows.go @@ -75,43 +75,40 @@ func filterManifests(manifests []manifestlist.ManifestDescriptor) []manifestlist var matches []manifestlist.ManifestDescriptor for _, manifestDescriptor := range manifests { + // TODO: Consider filtering out greater versions, including only greater UBR if manifestDescriptor.Platform.Architecture == runtime.GOARCH && manifestDescriptor.Platform.OS == lookingForOS { - if !versionMatch(manifestDescriptor.Platform.OSVersion, osVersion) { - continue - } matches = append(matches, manifestDescriptor) logrus.Debugf("found match for %s/%s with media type %s, digest %s", runtime.GOOS, runtime.GOARCH, manifestDescriptor.MediaType, manifestDescriptor.Digest.String()) } } - sort.Stable(manifestsByVersion(matches)) + if lookingForOS == "windows" { + sort.Stable(manifestsByVersion{osVersion, matches}) + } return matches } func versionMatch(actual, expected string) bool { - // Check whether actual and expected are equivalent, or whether - // expected is a version prefix of actual. - return actual == "" || expected == "" || actual == expected || strings.HasPrefix(actual, expected+".") + // Check whether the version matches up to the build, ignoring UBR + return strings.HasPrefix(actual, expected+".") } -type manifestsByVersion []manifestlist.ManifestDescriptor +type manifestsByVersion struct { + version string + list []manifestlist.ManifestDescriptor +} func (mbv manifestsByVersion) Less(i, j int) bool { - if mbv[i].Platform.OSVersion == "" { - return false - } - if mbv[j].Platform.OSVersion == "" { - return true - } // TODO: Split version by parts and compare // TODO: Prefer versions which have a greater version number - return false + // Move compatible versions to the top, with no other ordering changes + return versionMatch(mbv.list[i].Platform.OSVersion, mbv.version) && !versionMatch(mbv.list[j].Platform.OSVersion, mbv.version) } func (mbv manifestsByVersion) Len() int { - return len(mbv) + return len(mbv.list) } func (mbv manifestsByVersion) Swap(i, j int) { - mbv[i], mbv[j] = mbv[j], mbv[i] + mbv.list[i], mbv.list[j] = mbv.list[j], mbv.list[i] }