mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-03-06 07:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: reinstall the ceph-release package

Browse Source 
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 <ndevos@ibm.com>
(cherry picked from commit 21165dfc64)
This commit is contained in:
Niels de Vos 2025-02-11 16:30:52 +01:00 committed by mergify[bot]
parent b95a832493
commit f14a11ecaf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/cephcsi/image/Dockerfile
View File

@ -7,8 +7,10 @@ FROM ${BASE_IMAGE} as updated_base
# TODO: remove the following cmd, when issues # TODO: remove the following cmd, when issues
# https://github.com/ceph/ceph-container/issues/2034 # https://github.com/ceph/ceph-container/issues/2034
# https://github.com/ceph/ceph-container/issues/2141 are fixed. # https://github.com/ceph/ceph-container/issues/2141 are fixed.
RUN dnf config-manager --disable \ RUN true \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || 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 RUN mkdir /etc/selinux || true && touch /etc/selinux/config

6
scripts/Dockerfile.devel
View File

@ -20,8 +20,10 @@ RUN source /build.env \
# TODO: remove the following cmd, when issues # TODO: remove the following cmd, when issues
# https://github.com/ceph/ceph-container/issues/2034 # https://github.com/ceph/ceph-container/issues/2034
# https://github.com/ceph/ceph-container/issues/2141 are fixed. # https://github.com/ceph/ceph-container/issues/2141 are fixed.
RUN dnf config-manager --disable \ RUN true \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || 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 RUN mkdir /etc/selinux || true && touch /etc/selinux/config