From 954ea60a6aea854dbbe81e22a8f49996fd01bfb0 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 10 Feb 2020 12:05:14 +0300
Subject: [PATCH] Remove redundant compilers, linkers and libs

---
 docker/packager/binary/Dockerfile | 15 ---------------
 docker/packager/deb/Dockerfile    | 15 ---------------
 2 files changed, 30 deletions(-)

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 05e2f2c3b97..6d30578f269 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get --allow-unauthenticated update -y \
             apt-transport-https \
             ca-certificates
 
-RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list
 RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test
 
@@ -24,23 +23,10 @@ RUN apt-get update -y \
             cmake \
             ccache \
             curl \
-            gcc-7 \
-            g++-7 \
             gcc-8 \
             g++-8 \
             gcc-9 \
             g++-9 \
-            clang-6.0 \
-            lld-6.0 \
-            libclang-6.0-dev \
-            liblld-6.0-dev \
-            llvm-6.0 \
-            libllvm6.0 \
-            llvm-6.0-dev \
-            clang-7 \
-            lld-7 \
-            libclang-7-dev \
-            liblld-7-dev \
             clang-8 \
             lld-8 \
             libclang-8-dev \
@@ -58,7 +44,6 @@ RUN apt-get update -y \
             wget
 
 RUN ln -s /usr/bin/lld-8 /usr/bin/ld.lld
-RUN ln -s /usr/bin/lld-8 /usr/bin/ldd
 
 ENV CC=clang-8
 ENV CXX=clang++-8
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index dc150e9ba14..b937d9818ae 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -14,30 +14,16 @@ RUN apt-get --allow-unauthenticated update -y \
             ca-certificates
 
 
-RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list
 RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test
 
 RUN apt-get --allow-unauthenticated update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get --allow-unauthenticated install --yes --no-install-recommends \
-            gcc-7 \
-            g++-7 \
             gcc-8 \
             g++-8 \
             gcc-9 \
             g++-9 \
-            clang-6.0 \
-            lld-6.0 \
-            libclang-6.0-dev \
-            liblld-6.0-dev \
-            llvm-6.0 \
-            libllvm6.0 \
-            llvm-6.0-dev \
-            clang-7 \
-            lld-7 \
-            libclang-7-dev \
-            liblld-7-dev \
             clang-8 \
             lld-8 \
             libclang-8-dev \
@@ -89,7 +75,6 @@ RUN chmod +x dpkg-deb
 RUN cp dpkg-deb /usr/bin
 
 RUN ln -s /usr/bin/lld-8 /usr/bin/ld.lld
-RUN ln -s /usr/bin/lld-8 /usr/bin/ldd
 
 COPY build.sh /