Skip to content

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

Merged
tianon merged 7 commits intomoby:23.0from
thaJeztah:23.0_backport_vendor_containerd_1.6.21
May 5, 2023
Merged

[23.0 backport] vendor: github.com/containerd/containerd v1.6.21#45477
tianon merged 7 commits intomoby:23.0from
thaJeztah:23.0_backport_vendor_containerd_1.6.21

Conversation

@thaJeztah
Copy link
Copy Markdown
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 <[email protected]>
(cherry picked from commit e85c69e)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
- server: Fix connection leak when receiving ECONNRESET

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

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c733cf2)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
…d3f1b

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

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0233029)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 <[email protected]>
(cherry picked from commit 3f09316)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: containerd/containerd@de33abf...v1.6.20

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 61a0e79)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Uses containerd from release/1.6 commit containerd/containerd@c0efc63

Signed-off-by: Djordje Lukic <[email protected]>
(cherry picked from commit be4abf9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 <[email protected]>
(cherry picked from commit a873134)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@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
@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.

5 participants