Skip to content

Dockerfile: update container runtime components #5977

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

Merged

Conversation

austinvazquez
Copy link
Contributor

@austinvazquez austinvazquez commented May 17, 2025

This change updates a few container runtime components in CI:

  1. Integrate containerd v2.1.1, v2.0.6, v1.7.27
  2. Integrate runc v1.3.0
  3. Integrate nerdctl v2.1.2
  4. Integrate rootlesskit v2.3.5

@austinvazquez austinvazquez marked this pull request as ready for review May 19, 2025 03:21
@austinvazquez austinvazquez force-pushed the update-runtime-components-05162025 branch from 5243439 to 5d91f48 Compare May 19, 2025 03:27
@tonistiigi tonistiigi added this to the v0.23.0 milestone May 19, 2025
Comment on lines 110 to 112
- containerd-rootless
- containerd-1.6
- containerd-1.7
- containerd-2.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

containerd 1.6 will EOL in July 2025, so don't worry this list won't grow indefinitely. Once 1.7 EOL's in March 2026; the list should decrement to 2 versions at any time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove 1.6 already

Copy link
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update to containerd v2.1.1 as well.

@austinvazquez austinvazquez force-pushed the update-runtime-components-05162025 branch from 5d91f48 to 21c110f Compare May 21, 2025 04:41
@austinvazquez
Copy link
Contributor Author

I am still looking into the startup failures on FreeBSD. So far I don't believe it is related to rootlesskit or nerdctl changes.

@austinvazquez
Copy link
Contributor Author

I was able to confirm the FreeBSD issue is related to the containerd commit.
See https://github.com/austinvazquez/buildkit/actions/runs/15164775896

Perhaps the client needs to be vendored in the same commit. Going to test that.

tonistiigi and others added 5 commits May 21, 2025 09:09
This change adds containerd v2.1.1 into buildkit integration CI and
drops containerd v1.6.x which goes end-of-life in July 2025.

Signed-off-by: Austin Vazquez <[email protected]>
Signed-off-by: Austin Vazquez <[email protected]>
@tonistiigi
Copy link
Member

@crazy-max I didn't get what was exactly wrong with BSD, but this includes #5985 and seems to be ok, so if we can get this in we can close #5985

@crazy-max crazy-max merged commit 1bd26bf into moby:master May 28, 2025
111 checks passed
@austinvazquez austinvazquez deleted the update-runtime-components-05162025 branch June 5, 2025 02:52
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.

3 participants