From 664d1b0b1dbe3e83447caa31759b426a683e8122 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 7 Nov 2024 11:56:53 +0530 Subject: [PATCH] containers: Avoid version specific installation of packages Now that we have removed the `yum update` step, it doesn't make sense to install the matching development packages based on the version already present with the base container image. This is due to the fact that their availability is not always guaranteed. Instead leave it up to DNF to figure out if higher versions are available with the repositories. Signed-off-by: Anoop C S --- testing/containers/ceph/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testing/containers/ceph/Dockerfile b/testing/containers/ceph/Dockerfile index ff77f5d93..ff71ec1e7 100644 --- a/testing/containers/ceph/Dockerfile +++ b/testing/containers/ceph/Dockerfile @@ -12,14 +12,13 @@ RUN true \ && echo "Check: [ ${CEPH_VERSION} = ${GO_CEPH_VERSION} ]" \ && [ "${CEPH_VERSION}" = "${GO_CEPH_VERSION}" ] \ && (. /etc/os-release ; if [ "$ID" = centos -a "$VERSION" = 8 ]; then find /etc/yum.repos.d/ -name '*.repo' -exec sed -i -e 's|^mirrorlist=|#mirrorlist=|g' -e 's|^#baseurl=http://mirror.centos.org|baseurl=https://vault.centos.org|g' {} \; ; fi ) \ - && cv="$(rpm -q --queryformat '%{version}-%{release}' ceph-common)" \ && yum install -y \ git wget /usr/bin/curl make \ /usr/bin/cc /usr/bin/c++ gdb \ - "libcephfs-devel-${cv}" \ - "librados-devel-${cv}" \ - "librbd-devel-${cv}" \ - "libradosstriper-devel-${cv}" \ + libcephfs-devel \ + librados-devel \ + librbd-devel \ + libradosstriper-devel \ libcephfs2-debuginfo \ librados2-debuginfo \ librbd1-debuginfo \