Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/1.6] ctr/run: flags --detach and --rm cannot be specified together #8094

Merged
merged 1 commit into from Feb 13, 2023
Merged

[release/1.6] ctr/run: flags --detach and --rm cannot be specified together #8094

merged 1 commit into from Feb 13, 2023

Conversation

Iceber
Copy link
Member

@Iceber Iceber commented Feb 13, 2023

cherry-pick: #7929

@Iceber
ctr/run: flags --detach and --rm cannot be specified together
2b4b35a 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
(cherry picked from commit 0b9313c)
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
@k8s-ci-robot
Copy link

Hi @Iceber. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@samuelkarp samuelkarp merged commit 4d724f6 into containerd:release/1.6 Feb 13, 2023
@dmcgowan dmcgowan mentioned this pull request Feb 15, 2023
Merged
Mengkzhaoyun pushed a commit to open-beagle/containerd that referenced this pull request Feb 21, 2023
Merge tag 'v1.6.18' into main
6484ac6 
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
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

Assignees
No one assigned
Labels
needs-ok-to-test
Projects
Pull Request Review
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Iceber @k8s-ci-robot @dmcgowan @samuelkarp