diff --git a/clickhouse-client/Dockerfile b/clickhouse-client/Dockerfile
new file mode 100644
index 0000000..72eed37
--- /dev/null
+++ b/clickhouse-client/Dockerfile
@@ -0,0 +1,5 @@
+FROM yandex/clickhouse-client:1.1
+
+MAINTAINER Newnius <newnius.cn@gmail.com>
+
+CMD ["/usr/bin/clickhouse-client"]
diff --git a/clickhouse-client/README.md b/clickhouse-client/README.md
new file mode 100644
index 0000000..cb04689
--- /dev/null
+++ b/clickhouse-client/README.md
@@ -0,0 +1,4 @@
+# ClickHouse Client
+
+Change `ENTRYPOINT` to `CMD` to support for long-run client.
+