From 26ac6fa2917d3dd0576fcc5bcac7d46afbae6ac2 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Sun, 2 Jun 2024 08:20:52 +0530 Subject: [PATCH] Dockerfile: Avoid conflict with curl-minimal package 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 --- testing/containers/ceph/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/containers/ceph/Dockerfile b/testing/containers/ceph/Dockerfile index b80bdd9c5..4d2f55ef2 100644 --- a/testing/containers/ceph/Dockerfile +++ b/testing/containers/ceph/Dockerfile @@ -14,7 +14,7 @@ RUN true && \ yum update -y --disablerepo=ganesha && \ cv="$(rpm -q --queryformat '%{version}-%{release}' ceph-common)" && \ yum install -y \ - git wget curl make \ + git wget /usr/bin/curl make \ /usr/bin/cc /usr/bin/c++ \ "libcephfs-devel-${cv}" "librados-devel-${cv}" "librbd-devel-${cv}" \ gdb libcephfs2-debuginfo librados2-debuginfo librbd1-debuginfo && \