From f14a11ecaf9a651ee6a1d11c9a9b5d411f78a427 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 11 Feb 2025 16:30:52 +0100 Subject: [PATCH] build: reinstall the ceph-release package With the new Ceph container-build process, the .repo files for DNF are removed. This means that the build containers can not install required dependencies anymore, like librados-devel and librbd-devel. By reinstalling the ceph-release package from the Ceph distribution server, the .repo files are restored and the required Ceph packages can be installed again. Signed-off-by: Niels de Vos (cherry picked from commit 21165dfc64b6c5abc3f85faf570f077b70dfc8ec) --- deploy/cephcsi/image/Dockerfile | 6 ++++-- scripts/Dockerfile.devel | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile index dc717cd78..fd777c603 100644 --- a/deploy/cephcsi/image/Dockerfile +++ b/deploy/cephcsi/image/Dockerfile @@ -7,8 +7,10 @@ FROM ${BASE_IMAGE} as updated_base # TODO: remove the following cmd, when issues # https://github.com/ceph/ceph-container/issues/2034 # https://github.com/ceph/ceph-container/issues/2141 are fixed. -RUN dnf config-manager --disable \ - tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true +RUN true \ + && dnf -y reinstall https://download.ceph.com/rpm-${CEPH_VERSION}/el9/noarch/ceph-release-1-1.el9.noarch.rpm \ + && ( dnf config-manager --disable tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true ) \ + && true RUN mkdir /etc/selinux || true && touch /etc/selinux/config diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel index ec6c53d29..b86df6b40 100644 --- a/scripts/Dockerfile.devel +++ b/scripts/Dockerfile.devel @@ -20,8 +20,10 @@ RUN source /build.env \ # TODO: remove the following cmd, when issues # https://github.com/ceph/ceph-container/issues/2034 # https://github.com/ceph/ceph-container/issues/2141 are fixed. -RUN dnf config-manager --disable \ - tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true +RUN true \ + && dnf -y reinstall https://download.ceph.com/rpm-${CEPH_VERSION}/el9/noarch/ceph-release-1-1.el9.noarch.rpm \ + && ( dnf config-manager --disable tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true ) \ + && true RUN mkdir /etc/selinux || true && touch /etc/selinux/config