thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 09:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

more dockerfile fixes

Browse Source
This commit is contained in:
Mikhail Filimonov 2019-05-21 08:17:46 +02:00
parent 0ea0dc56a5
commit 4b6252aac9
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dbms/tests/integration/image/Dockerfile
View File

@ -1,7 +1,8 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
# yandex/clickhouse-integration-tests-runner
RUN apt-get update \
RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes \ && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
ca-certificates \ ca-certificates \
bash \ bash \
btrfs-progs \ btrfs-progs \
@ -21,8 +22,11 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes -
libicu-dev \ libicu-dev \
bsdutils \ bsdutils \
curl \ curl \
llvm-6.0 \ && rm -rf \
llvm-6.0-dev /var/lib/apt/lists/* \
/var/cache/debconf \
/tmp/* \
&& apt-get clean
ENV TZ=Europe/Moscow ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@ -32,12 +36,6 @@ RUN pip install pytest docker-compose==1.22.0 docker dicttoxml kazoo PyMySQL psy
ENV DOCKER_CHANNEL stable ENV DOCKER_CHANNEL stable
ENV DOCKER_VERSION 17.09.1-ce ENV DOCKER_VERSION 17.09.1-ce
ENV TSAN_OPTIONS 'halt_on_error=1 history_size=7'
ENV UBSAN_OPTIONS 'print_stacktrace=1'
ENV ASAN_SYMBOLIZER_PATH /usr/lib/llvm-6.0/bin/llvm-symbolizer
ENV UBSAN_SYMBOLIZER_PATH /usr/lib/llvm-6.0/bin/llvm-symbolizer
ENV LLVM_SYMBOLIZER_PATH /usr/lib/llvm-6.0/bin/llvm-symbolizer
RUN set -eux; \ RUN set -eux; \
\ \
# this "case" statement is generated via "update.sh" # this "case" statement is generated via "update.sh"

19
docker/test/integration/Dockerfile
View File

@ -1,12 +1,19 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
# yandex/clickhouse-integration-test
RUN apt-get update && apt-get -y install tzdata python llvm-6.0 llvm-6.0-dev RUN apt-get update \
&& env DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata python llvm-6.0 llvm-6.0-dev libreadline-dev libicu-dev bsdutils \
&& rm -rf \
/var/lib/apt/lists/* \
/var/cache/debconf \
/tmp/* \
&& apt-get clean
ENV TZ=Europe/Moscow ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD echo "TSAN_OPTIONS='halt_on_error=1 history_size=7'" >> /etc/environment; ENV TSAN_OPTIONS 'halt_on_error=1 history_size=7'
CMD echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; ENV UBSAN_OPTIONS 'print_stacktrace=1'
CMD echo "ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; ENV ASAN_SYMBOLIZER_PATH /usr/lib/llvm-6.0/bin/llvm-symbolizer
CMD echo "UBSAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; ENV UBSAN_SYMBOLIZER_PATH /usr/lib/llvm-6.0/bin/llvm-symbolizer
CMD echo "LLVM_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; ENV LLVM_SYMBOLIZER_PATH /usr/lib/llvm-6.0/bin/llvm-symbolizer