Skip to content

vendor: github.com/containerd/containerd v1.6.24#46488

Merged
thaJeztah merged 2 commits intomoby:masterfrom
thaJeztah:bump_containerd_1.6.24
Sep 15, 2023
Merged

vendor: github.com/containerd/containerd v1.6.24#46488
thaJeztah merged 2 commits intomoby:masterfrom
thaJeztah:bump_containerd_1.6.24

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Sep 15, 2023

vendor: github.com/Microsoft/hcsshim v0.9.10

Add support for platform compatibility check for windows + add windows builds

full diff: microsoft/hcsshim@v0.9.8...v0.9.10

vendor: github.com/containerd/containerd v1.6.24

full diff: containerd/containerd@v1.6.22...v1.6.24

v1.6.24 release notes:

full diff: containerd/containerd@v1.6.23...v1.6.24

The twenty-fourth patch release for containerd 1.6 contains various fixes
and updates.

Notable Updates

  • CRI: fix leaked shim caused by high IO pressure
  • Update to go1.20.8
  • Update runc to v1.1.9
  • Backport: add configurable mount options to overlay snapshotter
  • log: cleanups and improvements to decouple more from logrus

v1.6.23 release notes:

full diff: containerd/containerd@v1.6.22...v1.6.23

The twenty-third patch release for containerd 1.6 contains various fixes
and updates.

Notable Updates

  • Add stable ABI support in windows platform matcher + update hcsshim tag
  • cri: Don't use rel path for image volumes
  • Upgrade GitHub actions packages in release workflow
  • update to go1.19.12
  • backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed

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

Add support for platform compatibility check for windows + add windows builds

full diff: microsoft/hcsshim@v0.9.8...v0.9.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

Ah, dang, I messed up the links in the commit message (CI is green though!)

@thaJeztah thaJeztah force-pushed the bump_containerd_1.6.24 branch from 58e9e81 to 93c6934 Compare September 15, 2023 15:33
full diff: containerd/containerd@v1.6.22...v1.6.24

v1.6.24 release notes:

full diff: containerd/containerd@v1.6.23...v1.6.24

The twenty-fourth patch release for containerd 1.6 contains various fixes
and updates.

Notable Updates

- CRI: fix leaked shim caused by high IO pressure
- Update to go1.20.8
- Update runc to v1.1.9
- Backport: add configurable mount options to overlay snapshotter
- log: cleanups and improvements to decouple more from logrus

v1.6.23 release notes:

full diff: containerd/containerd@v1.6.22...v1.6.23

The twenty-third patch release for containerd 1.6 contains various fixes
and updates.

Notable Updates

- Add stable ABI support in windows platform matcher + update hcsshim tag
- cri: Don't use rel path for image volumes
- Upgrade GitHub actions packages in release workflow
- update to go1.19.12
- backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the bump_containerd_1.6.24 branch from 93c6934 to 1ffbbe7 Compare September 15, 2023 15:35
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Sep 15, 2023

@neersighted
Copy link
Copy Markdown
Member

You have the casts set up differently from my BuildKit PR (a5255a7), but your version also looks fine to me.

@thaJeztah
Copy link
Copy Markdown
Member Author

From our slack conversation;

I used the reverse for the type, with backport’ability in mind (also wasn’t sure if daemon/config was imported anywhere where we didn’t want containerd to become part of it)

For v25.0 I’m more comfortable making that change though, so perhaps in your rebase, you can still keep your variant

@thaJeztah thaJeztah merged commit a07f647 into moby:master Sep 15, 2023
@thaJeztah thaJeztah deleted the bump_containerd_1.6.24 branch September 15, 2023 18:11
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.

2 participants