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.

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

Dockerfile: Avoid conflict with curl-minimal package #993

Merged
merged 1 commit into from
Jun 3, 2024

Conversation

anoopcs9
Copy link
Collaborator

@anoopcs9 anoopcs9 commented Jun 2, 2024

With CentOS Stream 8 reaching end of builds phase most of our ceph images are migrating their bases to CentOS Stream 9. Since they come with curl by default in a minimal rpm package we switch to attempt the install by directly linking the binary than the package name. This is due to the conflict between curl and curl-minimal packages in CentOS Stream 9 images.

fixes #994

@anoopcs9 anoopcs9 force-pushed the fix-curl-minimal-conflict branch from 979a0bb to ca19769 Compare June 2, 2024 03:18
@anoopcs9 anoopcs9 requested a review from phlogistonjohn June 2, 2024 03:19
Copy link
Collaborator

@phlogistonjohn phlogistonjohn left a comment

Choose a reason for hiding this comment

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

Nice minimal fix, thanks!

@phlogistonjohn
Copy link
Collaborator

@Mergifyio rebase

With CentOS Stream 8 reaching end of builds phase most of our ceph
images are migrating their bases to CentOS Stream 9. Since they come
with curl by default in a minimal rpm package we switch to attempt the
install by directly linking the binary than the package name. This is
due to the conflict between curl and curl-minimal packages in CentOS
Stream 9 images.

Signed-off-by: Anoop C S <[email protected]>
Copy link

mergify bot commented Jun 3, 2024

rebase

✅ Branch has been successfully rebased

@phlogistonjohn phlogistonjohn force-pushed the fix-curl-minimal-conflict branch from ca19769 to d1f51d0 Compare June 3, 2024 18:24
@phlogistonjohn
Copy link
Collaborator

Of course, now the centos 8 stream based images are all failing.
Since this appears to improve things on the main and other pre-x images based on centos 9 I'm going to manually merge w/o meeting the requirements. We can figure out what to do WRT to the other suites separately.

@phlogistonjohn phlogistonjohn merged commit 26ac6fa into ceph:master Jun 3, 2024
8 of 14 checks passed
@anoopcs9 anoopcs9 deleted the fix-curl-minimal-conflict branch June 4, 2024 06:00
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.

CI failures with pre-reef and main jobs
2 participants