From 90405f3ebc981ebd789887a235bd311a62eb876a Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 9 Apr 2024 23:40:32 +0400 Subject: [PATCH] Install protobuf in Docker --- Telegram/build/docker/centos_env/Dockerfile | 9 +++++---- cmake | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 92cd7bf313..47164dc3e0 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -90,10 +90,11 @@ RUN git clone -b v21.9 --depth=1 --recursive {{ GIT }}/protocolbuffers/protobuf. -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \ -Dprotobuf_BUILD_LIBPROTOC=ON \ - -Dprotobuf_WITH_ZLIB_DEFAULT=OFF \ - -Dprotobuf_DEBUG_POSTFIX="" \ + -Dprotobuf_WITH_ZLIB=OFF \ && cmake --build build --parallel \ - && rm -rf .git + && DESTDIR="{{ LibrariesPath }}/protobuf-cache" cmake --install build \ + && cd .. \ + && rm -rf protobuf FROM builder AS lcms2 RUN git clone -b lcms2.15 --depth=1 {{ GIT }}/mm2/Little-CMS.git \ @@ -800,7 +801,7 @@ RUN cmake --build out --config Debug --parallel \ FROM builder-base COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache / COPY --link --from=xz {{ LibrariesPath }}/xz-cache / -COPY --link --from=protobuf {{ LibrariesPath }}/protobuf protobuf +COPY --link --from=protobuf {{ LibrariesPath }}/protobuf-cache / COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache / COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache / COPY --link --from=highway {{ LibrariesPath }}/highway-cache / diff --git a/cmake b/cmake index f921cb6aba..bf157ab03f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f921cb6aba9ada6099b3f9c8c237986ecda238f5 +Subproject commit bf157ab03f3d07c3822dcdd3e3f90a8e4ccb7d66