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

upgrade Go, Runc, Docker and Containerd #2317

Merged
merged 9 commits into from
Oct 2, 2024
Merged

upgrade Go, Runc, Docker and Containerd #2317

merged 9 commits into from
Oct 2, 2024

Conversation

flatcar-infra
Copy link

@flatcar-infra flatcar-infra commented Sep 13, 2024 •
edited by dongsupark
Loading

In this PR we upgrade Go to upgrade Runc to upgrade Containerd and Docker.

Closes: flatcar/Flatcar#1530
Closes: flatcar/Flatcar#1539
Closes: flatcar/Flatcar#1546

TODO:

@tormath1 tormath1 self-assigned this Sep 16, 2024
@tormath1 tormath1 changed the title Upgrade Containerd in main from 1.7.21 to 1.7.22 upgrade Go, Runc, Docker and Containerd Sep 16, 2024
@tormath1 tormath1 removed the on-hold label Sep 16, 2024
@tormath1 tormath1 mentioned this pull request Sep 18, 2024
Closed
4 tasks
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 23, 2024 •
edited
Loading

Build action triggered: https://github.com/flatcar/scripts/actions/runs/11145273538

@dongsupark dongsupark self-assigned this Sep 27, 2024
@dongsupark
Copy link
Member

CI passed, http://localhost:8080/job/container/job/sdk/1756/cldsv/.

@dongsupark dongsupark requested a review from a team September 30, 2024 13:56
@chewi
Copy link
Contributor

chewi commented Oct 2, 2024

I'm a little confused. We've bumped runc and containerd in Gentoo, but not Docker, even though we have it in portage-stable? I don't mind if we need to do it urgently for security, but I feel like we should at least try to get it bumped there first. If we already had a request open, I could get it merged now, but I can't reasonably do that if the maintainer hasn't been given a chance yet.

@dongsupark
Copy link
Member

I'm a little confused. We've bumped runc and containerd in Gentoo, but not Docker, even though we have it in portage-stable? I don't mind if we need to do it urgently for security, but I feel like we should at least try to get it bumped there first. If we already had a request open, I could get it merged now, but I can't reasonably do that if the maintainer hasn't been given a chance yet.

Upstream PR for docker 27.2.1 is still to be done.
I can look into that next week.

krnowak
krnowak approved these changes Oct 2, 2024
View reviewed changes
Copy link
Member

@krnowak krnowak left a comment

Choose a reason for hiding this comment

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

Looks alright, but the weekly updates will clobber our new docker ebuilds (unless they will get upstreamed by that time), so we will need to remember to revert the changes when working on the updates next time.

@krnowak
Copy link
Member

krnowak commented Oct 2, 2024

There are some conflicts to resolve, because I merged the weekly updates PR.

tormath1 and others added 9 commits October 2, 2024 16:32
@tormath1 @dongsupark
dev-lang/go: bump to 1.22
1dcf221 
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 @dongsupark
coreos-base/hard-host-depends: use go 1.22
7fce00f 
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 @dongsupark
eclass/coreos-go-depend: use go 1.22
0af9495 
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 @dongsupark
app-containers/runc: add runc 1.1.14
32e8cfe 
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@dongsupark
app-containers/containerd: Update from 1.7.21 to 1.7.22
52e26e9
@tormath1 @dongsupark
app-containers/docker{,-cli}: add version 27.2.1
163b0cd 
Can be dropped once upstreamed.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 @dongsupark
app-containers/docker-cli: apply Flatcar patch
785725c 
* for now, manpages are not generated yet.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 @dongsupark
build_library: remove two Docker files not used on Flatcar
0aab7da 
They were previously in /usr/share/docker/contrib which means they were
deleted at build time and not shipped into Docker sysext.

New ebuild version of Docker now provides those two files as symlinks to
/usr/share/docker/contrib from /usr/bin.

We can't really remove symlinks using find as docker-runc,
docker-containerd, etc. are broken symlinks too during the build phase.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@dongsupark
changelog: changelog for containerd, docker, Go, runc
04fc05b 
Add changelog for containerd, docker, Go, runc.
@dongsupark dongsupark merged commit e7c66ef into main Oct 2, 2024
1 check failed
@dongsupark dongsupark deleted the containerd-1.7.22-main branch October 2, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chewi chewi chewi approved these changes

@krnowak krnowak krnowak approved these changes

Assignees

@dongsupark dongsupark

@tormath1 tormath1

Labels
main
Projects
Flatcar tactical, release planning, and roadmap
Status: Implemented
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

update: docker update: go update: runc
5 participants
@flatcar-infra @dongsupark @chewi @krnowak @tormath1