8000 [27.x backport] Update containerd to v1.7.24 by thaJeztah · Pull Request #48934 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

[27.x backport] Update containerd to v1.7.24 #48934

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
Merged
merged 1 commit into from
Nov 22, 2024
Merged

[27.x backport] Update containerd to v1.7.24 #48934

merged 1 commit into from
Nov 22, 2024

Conversation

thaJeztah
Copy link
Member

(cherry picked from commit a650dbd)

Diff is slightly different in this branch, because we don't use all the same packages in 27.x

@dmcgowan @thaJeztah
Update containerd to v1.7.24
a648129 
Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit a650dbd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 27.4.0 milestone Nov 22, 2024
@thaJeztah thaJeztah self-assigned this Nov 22, 2024
@thaJeztah
Copy link
Member Author

CI failing due to Docker Hub having an active incident;
Screenshot 2024-11-22 at 15 52 21

@austinvazquez
Copy link
Contributor

Diff is slightly different in this branch, because we don't use all the same packages in 27.x

Oh that is interesting, I haven't thought of that occurrence before. Was there compilation failures to inform you to revendor?

@thaJeztah
Copy link
Member Author

Yeah, I think it complained about the file being modified but "deleted" in the branch, so it didn't go entirely unnoticed. I was aware of some changes being in master (and not in this branch) so I knew it was "ok" to fix up.

The usual other conflicts with these are in vendor.sum or vendor.mod itself. I do tend to (not always to be honest) run vendor.sh after cherry-picking to make sure nothing else changes.

@thaJeztah
Copy link
Member Author

In either case; all green now, so let me bring this one in 👍

@thaJeztah thaJeztah merged commit 4be68aa into moby:27.x Nov 22, 2024
141 checks passed
@thaJeztah thaJeztah deleted the 27.x_backport_update-containerd-1.7.24 branch November 22, 2024 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vvoland vvoland vvoland approved these changes

Assignees

@thaJeztah thaJeztah

Labels
area/dependencies area/runtime Runtime status/2-code-review
Projects
None yet
Milestone
27.4.0
Development

Successfully merging this pull request may close these issues.
4 participants
@thaJeztah @austinvazquez @vvoland @dmcgowan
0