mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-28 19:31:07 +00:00
Squashed commit of the following:
commit bedcf840b563aad3edb03b43417338fab0e7cb48 Author: proller <proller@github.com> Date: Mon Apr 2 20:17:36 2018 +0300 Revert "Prepare to new poco (PocoData renamed to PocoSQL)" This reverts commit ad5e11ad88ac4f1c3a5ad21153042e2498ca0d68. commit b7f1c352f0eb132b133846c7214e70a79f26e611 Merge: ad5e11ad8fb7e2cbd1
Author: proller <proller@github.com> Date: Mon Apr 2 20:12:10 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit ad5e11ad88ac4f1c3a5ad21153042e2498ca0d68 Author: proller <proller@github.com> Date: Mon Apr 2 20:09:49 2018 +0300 Prepare to new poco (PocoData renamed to PocoSQL) commit fcb90ca39dd32a29e29eb68bf559f381e80f74b4 Merge: 9ded77d62ad137994f
Author: proller <proller@github.com> Date: Mon Apr 2 13:17:01 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 9ded77d62aa668c6b7b55d209d5760bc5b517fbf Merge: 14cea9052412edac65
Author: proller <proller@github.com> Date: Fri Mar 30 21:06:20 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 14cea90524b8b977bff9b85647e00f0e1c26570b Merge: 9b6d88e6782932f904
Author: proller <proller@github.com> Date: Fri Mar 30 14:55:42 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 9b6d88e67b114a4c42b624690d691988be39f227 Merge: 0afe7b7d1b99783028
Author: proller <proller@github.com> Date: Thu Mar 29 20:35:15 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 0afe7b7d1f4792403ba4fb33dfb250ece2edc41d Author: proller <proller@github.com> Date: Wed Mar 28 16:03:55 2018 +0300 add docker/test commit c46f0b4084610a6d36b6823fb5ee48381866272e Author: proller <proller@github.com> Date: Wed Mar 28 15:43:53 2018 +0300 fix commit 3435dee49f31fe8f6cd9b01da4a2d5820f03a4a4 Author: proller <proller@github.com> Date: Wed Mar 28 15:18:54 2018 +0300 Fix query compile in docker, update docker image to ubuntu 17.10 artful
This commit is contained in:
parent
fb7e2cbd16
commit
24caaec50c
@ -1,11 +1,12 @@
|
||||
FROM ubuntu:16.04
|
||||
FROM ubuntu:17.10
|
||||
|
||||
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
||||
ARG version=\*
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y apt-transport-https && \
|
||||
apt-get install -y apt-transport-https dirmngr && \
|
||||
mkdir -p /etc/apt/sources.list.d && \
|
||||
apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 && \
|
||||
echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
|
||||
apt-get update && \
|
||||
apt-get install --allow-unauthenticated -y clickhouse-client=$version locales && \
|
||||
|
@ -3,4 +3,10 @@
|
||||
<listen_host>0.0.0.0</listen_host>
|
||||
<listen_host>::</listen_host>
|
||||
<listen_try>1</listen_try>
|
||||
|
||||
<!--
|
||||
<logger>
|
||||
<console>1</console>
|
||||
</logger>
|
||||
-->
|
||||
</yandex>
|
||||
|
19
docker/test/Dockerfile
Normal file
19
docker/test/Dockerfile
Normal file
@ -0,0 +1,19 @@
|
||||
FROM ubuntu:17.10
|
||||
|
||||
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
||||
ARG version=\*
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y apt-transport-https dirmngr && \
|
||||
mkdir -p /etc/apt/sources.list.d && \
|
||||
apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 && \
|
||||
echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
|
||||
apt-get update && \
|
||||
apt-get install --allow-unauthenticated -y clickhouse-test && \
|
||||
rm -rf /var/lib/apt/lists/* /var/cache/debconf && \
|
||||
apt-get clean
|
||||
|
||||
# clickhouse-test bug: dotn start without server config, remove after release 1.1.54372 :
|
||||
RUN mkdir -p /etc/clickhouse-server && echo "<y></y>" > /etc/clickhouse-server/config.xml
|
||||
|
||||
ENTRYPOINT ["/usr/bin/clickhouse-test"]
|
5
docker/test/README.md
Normal file
5
docker/test/README.md
Normal file
@ -0,0 +1,5 @@
|
||||
# ClickHouse Test Docker Image
|
||||
|
||||
## License
|
||||
|
||||
View [license information](https://github.com/yandex/ClickHouse/blob/master/LICENSE) for the software contained in this image.
|
Loading…
Reference in New Issue
Block a user