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.

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

[23.0 backport] vendor: github.com/containerd/containerd v1.6.21 #45477

Merged
merged 7 commits into from May 5, 2023

Conversation

thaJeztah
Copy link
Member

(partial) backports of;

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

laurazard and others added 7 commits May 5, 2023 20:14
…` and vendor

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
(cherry picked from commit e85c69e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- server: Fix connection leak when receiving ECONNRESET

full diff: containerd/ttrpc@v1.1.0...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c733cf2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…d3f1b

full diff: opencontainers/image-spec@02efb9a...3a7f492

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0233029)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
When running hack/vendor.sh, I noticed this file was added to vendor.
I suspect this should've been part of 0233029,
but the vendor check doesn't appear to be catching this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3f09316)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: containerd/containerd@de33abf...v1.6.20

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 61a0e79)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Uses containerd from release/1.6 commit containerd/containerd@c0efc63

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
(cherry picked from commit be4abf9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
release notes: https://github.com/containerd/containerd/releases/tag/v1.6.21

Notable Updates

- update runc binary to v1.1.7
- Remove entry for container from container store on error
- oci: partially restore comment on read-only mounts for uid/gid uses
- windows: Add ArgsEscaped support for CRI
- oci: Use WithReadonlyTempMount when adding users/groups
- archive: consistently respect value of WithSkipDockerManifest

full diff: containerd/containerd@c0efc63...v1.6.21

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a873134)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah marked this pull request as ready for review May 5, 2023 20:33
@tianon tianon merged commit e1c0536 into moby:23.0 May 5, 2023
87 checks passed
@thaJeztah thaJeztah deleted the 23.0_backport_vendor_containerd_1.6.21 branch May 5, 2023 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants