Retornam/updates#1538
Conversation
|
Hi there @retornam, thanks for the contribution! Few changes I'd like looked at before I can run the workflows:
Thanks again! |
|
@sondavidb first, thank you. I've resolved all the issues in the commits following your comments. |
|
Thanks! Seems we're having a bit of trouble running the CI. We'll try a few stuff on our end to fix this. I'll be closing and reopening it just to see if that would work — sometimes that fixes some weird broken GitHub actions stuff. (EDIT: Looks like just closing and reopening it worked 🙂) In the meantime @retornam would you mind squashing your commits? It's fine to have multiple commits if you want but generally we try to have one idea per commit. (If you want an opinion, I'd group all the version bumps into one commit, and the Dockerfile linting changes into another.) |
|
@sondavidb thanks. I'll squash my commits, I added the newer ones to make it easier to review the changes based on your previous comments. |
|
Yeah, the changes themselves look good, I'll get another reviewer once the commits are squashed |
|
@sondavidb squashed into two commits. |
|
Thanks @retornam, final thing could you just change the new squashed commit name to reflect the squashed changes? Probably something like "Bump Dockerfile versions" or something of the sort (currently a user might think this commit only bumps the containerd version when it changes more than that) |
|
@sondavidb done. |
|
The CI timeout seems unrelated to your changes, checked our GH Actions runs and seems like our integration tests have increased in time since late last week. All the other tests pass and time to run seems on par with the other GH Actions runs |
|
@sondavidb thank you. A committer can now merge this since I dont have the power to. |
|
@retornam Really sorry, I just took a look and it looks like hadolint is actually under GPL 3.0 (license file) so I don't think we can use that here. I should have checked the license before suggesting it, so that's my mistake. I think if we just remove the commit adding the GH Action and stick with the Dockerfile updates I'll be happy with that. I can followup and add a different linter on my own time. You've already done a lot for us so I don't want to add more to the churn. |
containerd to 1.7 According to [1] the 1.6 branch of containerd is in log term testing until July 23, 2025, they suggest upgrading to 1.7 which will be in long term testing until March 10, 2026. [1]https://github.com/containerd/containerd/blob/main/RELEASES.md Upgrade runc to 1.3.0 According to [1] opencontainers/runc "runc follows a 6-month minor version release schedule, with the aim of releases happening at the end of April and October each year." Starting with 1.3.0 which was released Apr 30th, 2025. This PR upgrades the image so we can follow their release cadence. [1] https://github.com/opencontainers/runc/blob/main/RELEASES.md Clear dnf cache after install Add the dnf clean command to clear the DNF cache, deletie temporary files, metadata, and cached packages. I also reformatted the Dockerfile to be follow recommended formatting guidelines Upgrade nerdctl to 1.7.7 A new version of nerdctl has been released[1] with several fixes and is compatible with containerd versions v1.6 and v1.7 [1] https://github.com/containerd/nerdctl/releases/tag/v1.7.7 Signed-off-by: Raymond Etornam <retornam@users.noreply.github.com>
|
@sondavidb done |
Issue #, if available: N/A
Description of changes:
Upgrades containerd, nerdctl and runc in Dockerfile
Testing performed:
built Dockerfile locally and ran it.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
✅ without objection so ordered.