Skip to content

Retornam/updates#1538

Merged
austinvazquez merged 1 commit into
awslabs:mainfrom
retornam:retornam/updates
May 7, 2025
Merged

Retornam/updates#1538
austinvazquez merged 1 commit into
awslabs:mainfrom
retornam:retornam/updates

Conversation

@retornam
Copy link
Copy Markdown
Contributor

@retornam retornam commented May 1, 2025

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.

@retornam retornam requested a review from a team as a code owner May 1, 2025 05:57
@sondavidb
Copy link
Copy Markdown
Contributor

Hi there @retornam, thanks for the contribution!

Few changes I'd like looked at before I can run the workflows:

  1. nerdctl 2.0 is actually a breaking change, largely due to them allowing namespace at a more macro level. For this reason we've held off on upgrading for now (we have a PR that we closed a bit ago due to CI failures). That's not to say we don't want to upgrade per se but that it will require more effort than the usual version bump. Bumping it to the latest 1.x version (v1.7.7) should be harmless, though.
  2. containerd bump to 1.7 is not strictly needed since our workflows already set the version number, but I could be convinced to bump it in our Dockerfile anyway to signal that it's the preferred version. (1.6 is planned to go EOL end of July anyway, so might as well?)
  3. I like the formatting changes, but I think it might be nice to also follow it up by adding a Dockerfile linter to our workflows, so that we can ensure we continue to confirm to standards. Seems that https://github.com/hadolint/hadolint-action is a popular tool to achieve this. I'd prefer to group an update to linting our Dockerfile with a linter as well, but I'm OK taking that up as a followup instead (done by either me or you, whichever you prefer).

Thanks again!

@github-actions github-actions Bot added the github_actions Pull requests that update GitHub Actions code label May 3, 2025
@retornam
Copy link
Copy Markdown
Contributor Author

retornam commented May 3, 2025

@sondavidb first, thank you. I've resolved all the issues in the commits following your comments.

@sondavidb
Copy link
Copy Markdown
Contributor

sondavidb commented May 5, 2025

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 sondavidb closed this May 5, 2025
@sondavidb sondavidb reopened this May 5, 2025
@retornam
Copy link
Copy Markdown
Contributor Author

retornam commented May 5, 2025

@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.

@sondavidb
Copy link
Copy Markdown
Contributor

Yeah, the changes themselves look good, I'll get another reviewer once the commits are squashed

@retornam retornam force-pushed the retornam/updates branch from 787bed1 to 744f804 Compare May 5, 2025 19:24
@retornam
Copy link
Copy Markdown
Contributor Author

retornam commented May 5, 2025

@sondavidb squashed into two commits.

@sondavidb
Copy link
Copy Markdown
Contributor

sondavidb commented May 5, 2025

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)

@retornam retornam force-pushed the retornam/updates branch from 744f804 to ef43e55 Compare May 6, 2025 06:03
@retornam
Copy link
Copy Markdown
Contributor Author

retornam commented May 6, 2025

@sondavidb done.

@sondavidb sondavidb closed this May 6, 2025
@sondavidb sondavidb reopened this May 6, 2025
sondavidb
sondavidb previously approved these changes May 6, 2025
@sondavidb
Copy link
Copy Markdown
Contributor

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

Kern--
Kern-- previously approved these changes May 6, 2025
@retornam
Copy link
Copy Markdown
Contributor Author

retornam commented May 6, 2025

@sondavidb thank you. A committer can now merge this since I dont have the power to.

@sondavidb
Copy link
Copy Markdown
Contributor

sondavidb commented May 6, 2025

@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>
@retornam retornam dismissed stale reviews from Kern-- and sondavidb via 9d171bc May 6, 2025 20:54
@retornam retornam force-pushed the retornam/updates branch from ef43e55 to 9d171bc Compare May 6, 2025 20:54
@github-actions github-actions Bot removed the github_actions Pull requests that update GitHub Actions code label May 6, 2025
@retornam
Copy link
Copy Markdown
Contributor Author

retornam commented May 6, 2025

@sondavidb done

@sondavidb sondavidb closed this May 6, 2025
@sondavidb sondavidb reopened this May 6, 2025
@austinvazquez austinvazquez merged commit 4b87d89 into awslabs:main May 7, 2025
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants