From 24caaec50c7a47c2190bb266c0cf4787fb253964 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Mon, 2 Apr 2018 20:17:59 +0300
Subject: [PATCH] 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
---
 docker/client/Dockerfile                |  5 +++--
 docker/server/docker_related_config.xml |  6 ++++++
 docker/test/Dockerfile                  | 19 +++++++++++++++++++
 docker/test/README.md                   |  5 +++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 docker/test/Dockerfile
 create mode 100644 docker/test/README.md

diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 9c8f3d087a3..59998b4a507 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -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 && \
diff --git a/docker/server/docker_related_config.xml b/docker/server/docker_related_config.xml
index ab6f82ad4c4..e1df3bb3890 100644
--- a/docker/server/docker_related_config.xml
+++ b/docker/server/docker_related_config.xml
@@ -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>
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
new file mode 100644
index 00000000000..75c9eba4d3b
--- /dev/null
+++ b/docker/test/Dockerfile
@@ -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"]
diff --git a/docker/test/README.md b/docker/test/README.md
new file mode 100644
index 00000000000..0833aacb822
--- /dev/null
+++ b/docker/test/README.md
@@ -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.