Skip to content

Containerfile: Support Rocky 10 as base image#66069

Merged
djgalloway merged 1 commit intomainfrom
r10-containerfile
Feb 25, 2026
Merged

Containerfile: Support Rocky 10 as base image#66069
djgalloway merged 1 commit intomainfrom
r10-containerfile

Conversation

@djgalloway
Copy link
Contributor

@djgalloway djgalloway commented Oct 27, 2025

Finally got a container built: https://jenkins.ceph.com/job/ceph-dev-pipeline/1531/console. Note, the SHA1 is different than this final commit. I only changed set and curl parameters to match the rest of the file.

Here's a CentOS 9 build just to ensure we didn't break backwards compatibility: https://jenkins.ceph.com/job/ceph-dev-pipeline/1532/console

@djgalloway djgalloway force-pushed the r10-containerfile branch 4 times, most recently from 5a6f662 to 8a721a7 Compare October 27, 2025 21:20
@djgalloway
Copy link
Contributor Author

djgalloway commented Oct 27, 2025

@djgalloway djgalloway changed the title container: Parameterize "el9" and "centos/9" container: Deduce "el9" and "centos/9" vars to support Rocky 10 Oct 27, 2025
@djgalloway
Copy link
Contributor Author

jenkins test docs

@djgalloway djgalloway force-pushed the r10-containerfile branch 8 times, most recently from cba5708 to 2bc307f Compare October 29, 2025 13:42
@djgalloway djgalloway changed the title container: Deduce "el9" and "centos/9" vars to support Rocky 10 Containerfile: Support Rocky 10 as base image Oct 29, 2025
@djgalloway djgalloway requested a review from dmick October 29, 2025 13:45
@djgalloway
Copy link
Contributor Author

djgalloway commented Oct 29, 2025

Aaaand force-pushed again to pull in #66059 to fix the docs build.

Signed-off-by: David Galloway <david.galloway@ibm.com>
@cbodley
Copy link
Contributor

cbodley commented Oct 29, 2025

stupid question, but do we need this abstraction for the base image? maybe we just choose to target rocky 10 as the container base for the U release and drop anything about centos 9?

@djgalloway
Copy link
Contributor Author

This parameterization enables us to test different base OSes at will. Now when el11 comes out, we can just say "use it" without having to hardcode more if statements.

@cbodley
Copy link
Contributor

cbodley commented Oct 29, 2025

thanks @djgalloway. i guess my point is that each ceph release only tests/ships one container image, and we'll probably only change that container base distro every ~2 major releases. we might leverage that fact by always targeting a single base image to avoid accumulating baggage like if [ "$MAJOR" -le 9 ] and special cases for centos vs rocky vs alma

@djgalloway
Copy link
Contributor Author

I thought tentacle is expected to work on CentOS 9 and Rocky 10. We would have caught the python3.12 thing much sooner if it was possible to ask for main built on Rocky 10 without a hardcoded Containerfile.

@cbodley
Copy link
Contributor

cbodley commented Oct 29, 2025

I thought tentacle is expected to work on CentOS 9 and Rocky 10. We would have caught the python3.12 thing much sooner if it was possible to ask for main built on Rocky 10 without a hardcoded Containerfile.

tentacle should support package installations on centos 9 and rocky 10. but we've never changed the container base in a point release, so i'd assume that tentacle containers will remain based on centos 9

@dmick
Copy link
Member

dmick commented Oct 29, 2025

not switching to el10 container base: I'm not sure of that. We wanted to switch when we cut tentacle, but things just weren't ready then.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73883.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73884.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73885.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73888.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73889.

batrick added a commit to batrick/ceph that referenced this pull request Nov 18, 2025
* refs/pull/66069/head:
	Containerfile: Support rocky/el10 in repo URLs
@batrick
Copy link
Member

batrick commented Dec 9, 2025

This PR is under test in https://tracker.ceph.com/issues/74161.

@github-actions
Copy link

github-actions bot commented Feb 7, 2026

This pull request has been automatically marked as stale because it has not had any activity for 60 days. It will be closed if no further activity occurs for another 30 days.
If you are a maintainer or core committer, please follow-up on this pull request to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

@github-actions github-actions bot added the stale label Feb 7, 2026
@batrick
Copy link
Member

batrick commented Feb 7, 2026

This PR is under test in https://tracker.ceph.com/issues/74811.

@github-actions github-actions bot removed the stale label Feb 7, 2026
batrick added a commit to batrick/ceph that referenced this pull request Feb 12, 2026
* refs/pull/66069/head:
	Containerfile: Support rocky/el10 in repo URLs
@djgalloway djgalloway merged commit 237566a into main Feb 25, 2026
18 checks passed
@djgalloway djgalloway deleted the r10-containerfile branch February 25, 2026 23:46
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.

6 participants