[1.6] Add fallback for windows platforms without osversion #8106
Conversation
This file contains 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
|
Realized this cherry-pick isn't quite right. |
cpuguy83
force-pushed
the
1.6_loosen_windows_platform_matching
branch
from
a32d5c0
to
d3921de
Compare
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> (cherry picked from commit 8442521) Signed-off-by: Brian Goff <cpuguy83@gmail.com>
cpuguy83
force-pushed
the
1.6_loosen_windows_platform_matching
branch
from
d3921de
to
b327af6
Compare
dcantah
approved these changes
Feb 14, 2023
kzys
approved these changes
Feb 15, 2023
Mengkzhaoyun
pushed a commit
to open-beagle/containerd
that referenced
this pull request
Feb 21, 2023
containerd 1.6.18 Welcome to the v1.6.18 release of containerd! The eighteenth patch release for containerd 1.6 includes fixes for CVE-2023-25153 and CVE-2023-25173 along with a security update for Go. * **Fix OCI image importer memory exhaustion** ([GHSA-259w-8hf6-59c2](GHSA-259w-8hf6-59c2)) * **Fix supplementary groups not being set up properly** ([GHSA-hmfx-3pcx-653p](GHSA-hmfx-3pcx-653p)) * **Revert removal of `/sbin/apparmor_parser` check** ([#8087](containerd/containerd#8087)) * **Update Go to 1.19.6** ([#8111](containerd/containerd#8111)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Akihiro Suda * Derek McGowan * Ye Sijun * Samuel Karp * Bjorn Neergaard * Wei Fu * Brian Goff * Iceber Gu * Kazuyoshi Kato * Phil Estes * Swagat Bora <details><summary>24 commits</summary> <p> * [release/1.6] Prepare release notes for v1.6.18 ([#8118](containerd/containerd#8118)) * [`44e61d764`](containerd/containerd@44e61d7) Add release notes for v1.6.18 * Github Security Advisory [GHSA-hmfx-3pcx-653p](GHSA-hmfx-3pcx-653p) * [`286a01f35`](containerd/containerd@286a01f) oci: fix additional GIDs * [`301823453`](containerd/containerd@3018234) oci: fix loop iterator aliasing * [`0070ab70f`](containerd/containerd@0070ab7) oci: skip checking gid for WithAppendAdditionalGroups * [`16d52de64`](containerd/containerd@16d52de) refactor: reduce duplicate code * [`b45e30292`](containerd/containerd@b45e302) add WithAdditionalGIDs test * [`0a06c284a`](containerd/containerd@0a06c28) add WithAppendAdditionalGroups helper * Github Security Advisory [GHSA-259w-8hf6-59c2](GHSA-259w-8hf6-59c2) * [`84936fd1f`](containerd/containerd@84936fd) importer: stream oci-layout and manifest.json * [1.6] Add fallback for windows platforms without osversion ([#8106](containerd/containerd#8106)) * [`b327af6a4`](containerd/containerd@b327af6) Add fallback for windows platforms without osversion * [release/1.6] Go 1.19.6 ([#8111](containerd/containerd#8111)) * [`54ead5b7b`](containerd/containerd@54ead5b) Go 1.19.6 * [release/1.6] ctr/run: flags --detach and --rm cannot be specified together ([#8094](containerd/containerd#8094)) * [`2b4b35ab4`](containerd/containerd@2b4b35a) ctr/run: flags --detach and --rm cannot be specified together * [release/1.6] Fix retry logic within devmapper device deactivation ([#8088](containerd/containerd#8088)) * [`d5284157b`](containerd/containerd@d528415) Fix retry logic within devmapper device deactivation * [release/1.6 backport] Revert `apparmor_parser` regression ([#8087](containerd/containerd#8087)) * [`624ff636b`](containerd/containerd@624ff63) pkg/apparmor: clarify Godoc * [`3a0a35b36`](containerd/containerd@3a0a35b) Revert "Don't check for apparmor_parser to be present" * [release/1.6] CI: skip some jobs when `repo != containerd/containerd` ([#8083](containerd/containerd#8083)) * [`664a938a3`](containerd/containerd@664a938) CI: skip some jobs when `repo != containerd/containerd` </p> </details> This release has no dependency changes Previous release can be found at [v1.6.17](https://github.com/containerd/containerd/releases/tag/v1.6.17)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
(cherry picked from commit 8442521)