Skip to content

Commit

Permalink
containers: Avoid version specific installation of packages
Browse files Browse the repository at this point in the history
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 <anoopcs@cryptolab.net>
  • Loading branch information
anoopcs9 authored and phlogistonjohn committed Nov 12, 2024
1 parent 29ca21b commit 664d1b0
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions testing/containers/ceph/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 664d1b0

Please sign in to comment.