Skip to content

Commit

Permalink
build: remove conflicting protobuf package
Browse files Browse the repository at this point in the history
Signed-off-by: Niels de Vos <[email protected]>
  • Loading branch information
nixpanic committed Oct 22, 2024
1 parent 5592324 commit 0f28509
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions deploy/cephcsi/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions scripts/Dockerfile.devel
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 0f28509

Please sign in to comment.