Add fallback for windows platforms without osversion#8101
Merged
kevpar merged 1 commit intocontainerd:mainfrom Feb 14, 2023
Merged
Add fallback for windows platforms without osversion#8101kevpar merged 1 commit intocontainerd:mainfrom
kevpar merged 1 commit intocontainerd:mainfrom
Conversation
Member
Author
samuelkarp
previously approved these changes
Feb 13, 2023
Contributor
|
/lgtm (minus the outdated unit tests) |
The background for this change: 1. Windows host-process containers do not have an OS version set 2. Buildx v0.10 started pushing manifest lists by default, but it never has the OSVersion in the platform data (not that there is any way to specify what particular OS version you want). The change means that containerd cannot run images created with the new buildx on Windows because there is no matching OSVersion in the list of manifests. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
1689eb7 to
8442521
Compare
Member
Author
|
Fixed the tests. |
tianon
approved these changes
Feb 14, 2023
Member
tianon
left a comment
There was a problem hiding this comment.
I do not like it, but it's a fair interpretation and the logic seems correct 😅
Contributor
I agree. I don't really like it but it should fix the issue. |
samuelkarp
approved these changes
Feb 14, 2023
Member
dmcgowan
approved these changes
Feb 14, 2023
estesp
approved these changes
Feb 14, 2023
Member
|
backport for 1.6; #8106 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The background for this change:
Fixes #8070
Fixes #7431