From ca6b634eb0466361da6f3526a6611ab0ccd8bfc1 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 9 Sep 2020 13:51:01 +0300
Subject: [PATCH] Install gcc-10 from proposed repo

---
 docker/packager/binary/Dockerfile | 13 +++++++++++--
 docker/packager/deb/Dockerfile    | 12 ++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 45c35c2e0f3..b911b59a41d 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -32,8 +32,6 @@ RUN apt-get update \
         curl \
         gcc-9 \
         g++-9 \
-        gcc-10 \
-        g++-10 \
         llvm-${LLVM_VERSION} \
         clang-${LLVM_VERSION} \
         lld-${LLVM_VERSION} \
@@ -93,5 +91,16 @@ RUN wget -nv "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.0
 # Download toolchain for FreeBSD 11.3
 RUN wget -nv https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
 
+# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
+# Current workaround is to use latest version proposed repo. Remove as soon as
+# gcc-10.2 appear in stable repo.
+RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
+
+RUN apt-get update \
+    && apt-get install gcc-10 g++10 --yes
+
+RUN rm /etc/apt/sources.list.d/proposed-repositories.list
+
+
 COPY build.sh /
 CMD ["/bin/bash", "/build.sh"]
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 87f4582f8e2..30334504c55 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -42,8 +42,6 @@ RUN  export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
 # Libraries from OS are only needed to test the "unbundled" build (this is not used in production).
 RUN apt-get update \
     && apt-get install \
-        gcc-10 \
-        g++-10 \
         gcc-9 \
         g++-9 \
         clang-11 \
@@ -75,6 +73,16 @@ RUN apt-get update \
         pigz \
         --yes --no-install-recommends
 
+# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
+# Current workaround is to use latest version proposed repo. Remove as soon as
+# gcc-10.2 appear in stable repo.
+RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
+
+RUN apt-get update \
+    && apt-get install gcc-10 g++10 --yes --no-install-recommends
+
+RUN rm /etc/apt/sources.list.d/proposed-repositories.list
+
 # This symlink required by gcc to find lld compiler
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld