mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-19 06:01:57 +00:00
ee087a1541
* 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: ad5e11ad8 fb7e2cbd1
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: 9ded77d62 ad137994f
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: 14cea9052 412edac65
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: 9b6d88e67 82932f904
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: 0afe7b7d1 b99783028
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
* Update Dockerfile
22 lines
693 B
Docker
22 lines
693 B
Docker
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-client=$version locales && \
|
|
rm -rf /var/lib/apt/lists/* /var/cache/debconf && \
|
|
apt-get clean
|
|
|
|
RUN locale-gen en_US.UTF-8
|
|
ENV LANG en_US.UTF-8
|
|
ENV LANGUAGE en_US:en
|
|
ENV LC_ALL en_US.UTF-8
|
|
|
|
ENTRYPOINT ["/usr/bin/clickhouse-client"]
|