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

Update packager images

Browse Source
This commit is contained in:
Alexey Milovidov 2020-03-23 00:10:14 +03:00
parent 21f478e2c0
commit 8df43f2f50
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker/packager/binary/Dockerfile
View File

@ -1,5 +1,5 @@
# docker build -t yandex/clickhouse-binary-builder .
FROM ubuntu:18.04
FROM ubuntu:19.10
RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \
@ -13,9 +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-8 main" >> /etc/apt/sources.list
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
RUN apt-get update -y \
&& env DEBIAN_FRONTEND=noninteractive \
apt-get install --yes --no-install-recommends \
@ -23,15 +20,11 @@ RUN apt-get update -y \
cmake \
ccache \
curl \
gcc-8 \
g++-8 \
gcc-9 \
g++-9 \
clang-8 \
lld-8 \
libclang-8-dev \
liblld-8-dev \
clang-tidy-8 \
clang-9 \
lld-9 \
clang-tidy-9 \
libicu-dev \
libreadline-dev \
ninja-build \
@ -45,10 +38,10 @@ RUN apt-get update -y \
wget
# This symlink required by gcc to find lld compiler
RUN ln -s /usr/bin/lld-8 /usr/bin/ld.lld
RUN ln -s /usr/bin/lld-9 /usr/bin/ld.lld
ENV CC=clang-8
ENV CXX=clang++-8
ENV CC=clang-9
ENV CXX=clang++-9
# libtapi is required to support .tbh format from recent MacOS SDKs
RUN git clone https://github.com/tpoechtrager/apple-libtapi.git
@ -64,6 +57,7 @@ RUN rm -rf cctools-port
RUN wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz
# Download toolchain for ARM
# It contains all required headers and libraries. Note that it's named as "gcc" but actually we are using clang for cross compiling.
RUN wget "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en" -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz
COPY build.sh /

19
docker/packager/deb/Dockerfile
View File

@ -1,5 +1,5 @@
# docker build -t yandex/clickhouse-deb-builder .
FROM ubuntu:18.04
FROM ubuntu:19.10
RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \
@ -13,22 +13,15 @@ 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-8 main" >> /etc/apt/sources.list
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
# Libraries from OS are only needed to test the "unbundled" build (that is not used in production).
RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \
apt-get --allow-unauthenticated install --yes --no-install-recommends \
gcc-8 \
g++-8 \
gcc-9 \
g++-9 \
clang-8 \
lld-8 \
libclang-8-dev \
liblld-8-dev \
clang-tidy-8 \
clang-9 \
lld-9 \
clang-tidy-9 \
libicu-dev \
libreadline-dev \
gperf \
@ -75,7 +68,7 @@ RUN chmod +x dpkg-deb
RUN cp dpkg-deb /usr/bin
# This symlink required by gcc to find lld compiler
RUN ln -s /usr/bin/lld-8 /usr/bin/ld.lld
RUN ln -s /usr/bin/lld-9 /usr/bin/ld.lld
COPY build.sh /