thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant compilers, linkers and libs

Browse Source
This commit is contained in:
alesapin 2020-02-10 12:05:14 +03:00
parent bddbc956ec
commit 954ea60a6a
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/packager/binary/Dockerfile
View File

@ -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

15
docker/packager/deb/Dockerfile
View File

@ -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 /