opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 11:08:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17529 from containers/dependabot/go_modules/github.com/containerd/containerd-1.6.18

Browse Source 
build(deps): bump github.com/containerd/containerd from 1.6.16 to 1.6.18
This commit is contained in:
OpenShift Merge Robot
2023-02-20 16:16:04 +01:00
committed by GitHub
parent 59fff50a8e 6f5ca7318f
commit cdd755d20e
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vendor/github.com/containerd/containerd/platforms/defaults_windows.go generated vendored
View File

@@ -46,10 +46,14 @@ type matchComparer struct {
// Match matches platform with the same windows major, minor
// and build version.
func (m matchComparer) Match(p imagespec.Platform) bool {
if m.defaults.Match(p) {
// TODO(windows): Figure out whether OSVersion is deprecated.
return strings.HasPrefix(p.OSVersion, m.osVersionPrefix)
func (m matchComparer) Match(p specs.Platform) bool {
match := m.defaults.Match(p)
if match && p.OS == "windows" {
if strings.HasPrefix(p.OSVersion, m.osVersionPrefix) {
return true
}
return p.OSVersion == ""
}
return false
}