From 512bba485bf6cd587b1fa5f923a95832547b6e37 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 22 Oct 2024 13:18:44 +0200 Subject: [PATCH] build: remove conflicting protobuf package Signed-off-by: Niels de Vos --- deploy/cephcsi/image/Dockerfile | 3 +++ scripts/Dockerfile.devel | 3 +++ 2 files changed, 6 insertions(+) diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile index 52c2462cf..dc717cd78 100644 --- a/deploy/cephcsi/image/Dockerfile +++ b/deploy/cephcsi/image/Dockerfile @@ -38,6 +38,9 @@ RUN source /build.env && \ # test if the downloaded version of Golang works (different arch?) 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 \ librados-devel librbd-devel libcephfs-devel \ /usr/bin/cc \ diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel index 8ecbd2432..efd552488 100644 --- a/scripts/Dockerfile.devel +++ b/scripts/Dockerfile.devel @@ -25,6 +25,9 @@ RUN dnf config-manager --disable \ 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 \ git \ make \