mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-02 03:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: create /etc/selinux/config in case it is missing

Browse Source 
Sometimes the Ceph container images seem to have a broken scriptlet
while installing/updating Ceph packages. It is relatively common for
them to fail when `/etc/selinux/config` does not exist. By ensuring the
file directory and file exist (even if empty), the package installation
or upgrades succeed.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit 24d6b5fe3f)
This commit is contained in:
Niels de Vos 2023-12-19 10:03:45 +01:00 committed by mergify[bot]
parent d3d17d583e
commit 0d66c35a5b
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/cephcsi/image/Dockerfile
View File

@ -10,6 +10,8 @@ FROM ${BASE_IMAGE} as updated_base
RUN dnf config-manager --disable \ RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true
RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN dnf -y update --nobest \ RUN dnf -y update --nobest \
&& dnf -y install nfs-utils \ && dnf -y install nfs-utils \
&& dnf clean all \ && dnf clean all \

2
scripts/Dockerfile.devel
View File

@ -23,6 +23,8 @@ RUN source /build.env \
RUN dnf config-manager --disable \ RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true
RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN dnf -y install \ RUN dnf -y install \
git \ git \
make \ make \

2
scripts/Dockerfile.test
View File

@ -23,6 +23,8 @@ ENV \
COPY build.env / COPY build.env /
RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN source /build.env \ RUN source /build.env \
&& \ && \
( test -n "${GOARCH}" && exit 0; echo -e "\n\nMissing GOARCH argument for building image, install Golang or run: make containerized-test GOARCH=amd64\n\n"; exit 1 ) \ ( test -n "${GOARCH}" && exit 0; echo -e "\n\nMissing GOARCH argument for building image, install Golang or run: make containerized-test GOARCH=amd64\n\n"; exit 1 ) \