Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update "builder" docker image #9809

Merged
merged 2 commits into from
Mar 22, 2020
Merged

Update "builder" docker image #9809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f478e
Update "builder" docker image
alexey-milovidov Mar 22, 2020
8df43f2
Update packager images
alexey-milovidov Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 7 additions & 12 deletions docker/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
FROM ubuntu:18.04
FROM ubuntu:19.10

RUN apt-get update -y \
&& apt-get install -y software-properties-common \
&& add-apt-repository ppa:ubuntu-toolchain-r/test \
&& env DEBIAN_FRONTEND=noninteractive \
apt-get install --yes --no-install-recommends \
bash \
ccache \
cmake \
curl \
expect \
g++-9 \
gcc-9 \
libreadline-dev \
g++ \
gcc \
ninja-build \
perl \
pkg-config \
Expand All @@ -22,12 +19,10 @@ RUN apt-get update -y \
python-termcolor \
sudo \
tzdata \
gperf \
libcctz-dev

RUN apt install -y wget
RUN printf "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main\ndeb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && apt update && apt-get install -y clang-8 lldb-8 lld-8
clang \
clang-tidy \
lld \
lldb

COPY build.sh /

Expand Down
22 changes: 8 additions & 14 deletions docker/packager/binary/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -13,25 +13,18 @@ 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 \
bash \
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 \
Expand All @@ -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
Expand All @@ -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 /
Expand Down
19 changes: 6 additions & 13 deletions docker/packager/deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 /

Expand Down