From 4f5558d28c66ccb546269e099201b09466ee44b6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 12 Sep 2021 01:23:37 +0400 Subject: [PATCH] Move new dependencies to the beginning of Dockerfile, update patches The reason was to not to do a full rebuild, but looks like the cache is already cleaned --- Telegram/build/docker/centos_env/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 50ac9bfb9..c03bc9f29 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -19,7 +19,8 @@ RUN yum -y install git cmake3 meson ninja-build autoconf automake libtool \ pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel libudev-devel \ webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \ devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \ - devtoolset-9-binutils + devtoolset-9-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \ + llvm-toolset-7.0-llvm-devel SHELL [ "scl", "enable", "devtoolset-9", "--", "bash", "-c" ] RUN ln -s cmake3 /usr/bin/cmake @@ -28,7 +29,7 @@ ENV LibrariesPath /usr/src/Libraries WORKDIR $LibrariesPath FROM builder AS patches -RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 1a51e396bb +RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 3e8b68dfdf FROM builder AS extra-cmake-modules @@ -868,8 +869,6 @@ COPY --from=breakpad ${LibrariesPath}/breakpad breakpad COPY --from=breakpad ${LibrariesPath}/breakpad-cache / COPY --from=webrtc ${LibrariesPath}/tg_owt tg_owt -RUN yum -y install llvm-toolset-7.0 llvm-toolset-7.0-clang-devel llvm-toolset-7.0-llvm-devel - WORKDIR ../tdesktop VOLUME [ "/usr/src/tdesktop" ] CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]