Docker: use ubuntu artful 17.10 for building (#1887)

* Docker wip

* no tests

* fixes

* No tests

* Fixes

* Clean
This commit is contained in:
proller 2018-02-12 18:42:27 +03:00 committed by alexey-milovidov
parent d8353b0757
commit 9ec8a576cf
5 changed files with 26 additions and 32 deletions

6
debian/.pbuilderrc vendored
View File

@ -56,11 +56,11 @@ DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $STABLE_BAC
UBUNTU_SUITES=("bionic" "artful" "zesty" "xenial" "trusty" "devel")
# Mirrors to use. Update these to your preferred mirror.
DEBIAN_MIRROR="deb.debian.org"
#UBUNTU_MIRROR="mirrors.kernel.org"
DEBIAN_MIRROR=${DEBIAN_MIRROR:=deb.debian.org}
UBUNTU_MIRROR=${UBUNTU_MIRROR:=archive.ubuntu.com}
#DEBIAN_MIRROR="mirror.yandex.ru"
UBUNTU_MIRROR="mirror.yandex.ru"
#UBUNTU_MIRROR="mirror.yandex.ru"
# Set a default distribution if none is used. Note that you can set your own default (i.e. ${DIST:="unstable"}).
HOST_DIST=`lsb_release --short --codename`

View File

@ -1,18 +1,14 @@
FROM ubuntu:14.04
FROM ubuntu:17.10
RUN apt-get update -y
RUN apt-get install -y software-properties-common && \
add-apt-repository ppa:ubuntu-toolchain-r/test
RUN apt-get update -y && \
apt-get install -y git cmake3 libssl-dev libcrypto++-dev \
libglib2.0-dev libltdl-dev libicu-dev libmysql++-dev \
libreadline-dev libmysqlclient-dev unixodbc-dev \
gcc-7 g++-7 unixodbc-dev devscripts dupload fakeroot debhelper
RUN apt update -y && \
apt install -y cmake libssl-dev libcrypto++-dev \
libglib2.0-dev libltdl-dev libicu-dev libmysql++-dev \
libreadline-dev libmysqlclient-dev unixodbc-dev \
gcc-7 g++-7 unixodbc-dev devscripts dupload fakeroot debhelper \
liblld-5.0-dev libclang-5.0-dev liblld-5.0
# For tests: # bash expect python python-lxml python-termcolor curl perl sudo tzdata
ADD build.sh /
RUN chmod +x /build.sh
CMD ["/build.sh"]

View File

@ -1,9 +1,7 @@
#!/bin/bash
export THREADS=$(grep -c ^processor /proc/cpuinfo)
export CC=gcc-7
export CXX=g++-7
mkdir -p /server/build
cmake /server
make -j $THREADS
mkdir -p /server/build_docker
cd /server/build_docker
cmake /server -DUSE_EMBEDDED_COMPILER=1 -DENABLE_TESTS=0
make -j $(nproc || grep -c ^processor /proc/cpuinfo)
#ctest -V -j $(nproc || grep -c ^processor /proc/cpuinfo)

View File

@ -3,14 +3,14 @@ FROM ubuntu:16.04
ARG repository="deb https://repo.yandex.ru/clickhouse/xenial/ dists/stable/main/binary-amd64/"
ARG version=\*
RUN apt-get update && \
apt-get install -y apt-transport-https tzdata && \
RUN apt update && \
apt install -y apt-transport-https && \
mkdir -p /etc/apt/sources.list.d && \
echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
apt-get update && \
apt-get install --allow-unauthenticated -y clickhouse-client=$version locales && \
apt update && \
apt install --allow-unauthenticated -y clickhouse-client=$version locales && \
rm -rf /var/lib/apt/lists/* /var/cache/debconf && \
apt-get clean
apt clean
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8

View File

@ -3,14 +3,14 @@ FROM ubuntu:16.04
ARG repository="deb https://repo.yandex.ru/clickhouse/xenial/ dists/stable/main/binary-amd64/"
ARG version=\*
RUN apt-get update && \
apt-get install -y apt-transport-https tzdata && \
RUN apt update && \
apt install -y apt-transport-https && \
mkdir -p /etc/apt/sources.list.d && \
echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
apt-get update && \
apt-get install --allow-unauthenticated -y clickhouse-server-common=$version clickhouse-server-base=$version && \
apt update && \
apt install --allow-unauthenticated -y clickhouse-server-common=$version clickhouse-server-base=$version && \
rm -rf /var/lib/apt/lists/* /var/cache/debconf && \
apt-get clean
apt clean
COPY docker_related_config.xml /etc/clickhouse-server/config.d/
RUN chown -R clickhouse /etc/clickhouse-server/