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

build: remove conflicting protobuf package

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2024-10-22 13:18:44 +02:00 committed by mergify[bot]
parent 9152b4c2c7
commit 512bba485b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/cephcsi/image/Dockerfile
View File

@ -38,6 +38,9 @@ RUN source /build.env && \
# test if the downloaded version of Golang works (different arch?) # test if the downloaded version of Golang works (different arch?)
RUN ${GOROOT}/bin/go version && ${GOROOT}/bin/go env RUN ${GOROOT}/bin/go version && ${GOROOT}/bin/go env
# other/conflicting versions of protobuf get installed as dependency
RUN dnf -y remove protobuf
RUN dnf -y install --nodocs \ RUN dnf -y install --nodocs \
librados-devel librbd-devel libcephfs-devel \ librados-devel librbd-devel libcephfs-devel \
/usr/bin/cc \ /usr/bin/cc \

3
scripts/Dockerfile.devel
View File

@ -25,6 +25,9 @@ RUN dnf config-manager --disable \
RUN mkdir /etc/selinux || true && touch /etc/selinux/config RUN mkdir /etc/selinux || true && touch /etc/selinux/config
# other/conflicting versions of protobuf get installed as dependency
RUN dnf -y remove protobuf
RUN dnf -y install \ RUN dnf -y install \
git \ git \
make \ make \