Skip to content

Commit

Permalink
dev container: add support for clickhouse testing
Browse files Browse the repository at this point in the history
  • Loading branch information
rgerhards committed Dec 14, 2018
1 parent 7a32660 commit 3b2b067
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
10 changes: 10 additions & 0 deletions dev_env/ubuntu/base/16.04/Dockerfile
Expand Up @@ -55,6 +55,8 @@ RUN apt-get install -y \
RUN add-apt-repository ppa:adiscon/v8-stable -y && \
add-apt-repository ppa:qpid/released -y && \
add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
echo "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" > /etc/apt/sources.list.d/clickhouse.list && \
apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 && \
echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" > /etc/apt/sources.list.d/llvm.list && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
echo "deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-draft/xUbuntu_16.04/ ./" > /etc/apt/sources.list.d/0mq.list && \
Expand All @@ -63,6 +65,8 @@ RUN add-apt-repository ppa:adiscon/v8-stable -y && \

RUN apt-get update -y && \
apt-get install -y \
clickhouse-client \
clickhouse-server \
libestr-dev \
librelp-dev \
libqpid-proton10-dev \
Expand Down Expand Up @@ -97,12 +101,18 @@ RUN mkdir /local_dep_cache && \
# to adjust test sources.
ENV ELASTICSEARCH_NEWEST="elasticsearch-6.3.1.tar.gz"

# tell CI env how to handle clickhouse
ENV CLICKHOUSE_START_CMD="sudo clickhouse-server --config-file=/etc/clickhouse-server/config.xml" \
CLICKHOUSE_STOP_CMD="sudo kill $(pidof clickhouse-server)"

# next ENV is specifically for running scan-build - so we do not need to
# change scripts if at a later time we can move on to a newer version
ENV SCAN_BUILD=scan-build \
SCAN_BUILD_CC=clang-5.0

ENV RSYSLOG_CONFIGURE_OPTIONS \
--enable-clickhouse \
--enable-clickhouse-tests \
--enable-elasticsearch \
--enable-elasticsearch-tests \
--enable-gnutls \
Expand Down
2 changes: 2 additions & 0 deletions dev_env/ubuntu/base/16.04/tag-previous.sh
@@ -0,0 +1,2 @@
docker tag rsyslog/rsyslog_dev_base_ubuntu:16.04 rsyslog/rsyslog_dev_base_ubuntu:16.04_previous
docker push rsyslog/rsyslog_dev_base_ubuntu:16.04_previous
3 changes: 3 additions & 0 deletions dev_env/ubuntu/base/18.04/Dockerfile
Expand Up @@ -75,6 +75,8 @@ RUN echo "deb http://download.opensuse.org/repositories/network:/messaging:/zero
libfastjson-dev \
liblogging-stdlog-dev \
liblognorm-dev
RUN sed -i 's/<yandex>/<yandex>\n <core_dump><size_limit>0<\/size_limit><\/core_dump>/g' \
/etc/clickhouse-server/config.xml
WORKDIR /home/devel
VOLUME /rsyslog
RUN groupadd rsyslog \
Expand Down Expand Up @@ -131,6 +133,7 @@ ENV SCAN_BUILD=scan-build \

ENV RSYSLOG_CONFIGURE_OPTIONS \
--enable-clickhouse \
--enable-clickhouse-tests \
--enable-elasticsearch \
--enable-elasticsearch-tests \
--enable-gnutls \
Expand Down

0 comments on commit 3b2b067

Please sign in to comment.