From 02da52103061a499c7174c6d6778569ba3df27e5 Mon Sep 17 00:00:00 2001 From: Nikolay Volosatov Date: Thu, 16 Jun 2016 13:24:37 +0300 Subject: [PATCH] Update Dockerfiles --- docker/client/{1.1.53981 => }/Dockerfile | 9 ++------- docker/server/{1.1.53981 => }/Dockerfile | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) rename docker/client/{1.1.53981 => }/Dockerfile (50%) rename docker/server/{1.1.53981 => }/Dockerfile (82%) diff --git a/docker/client/1.1.53981/Dockerfile b/docker/client/Dockerfile similarity index 50% rename from docker/client/1.1.53981/Dockerfile rename to docker/client/Dockerfile index 1cfe8b0256..13d43e2ab3 100644 --- a/docker/client/1.1.53981/Dockerfile +++ b/docker/client/Dockerfile @@ -1,14 +1,9 @@ FROM ubuntu:14.04 -ENV CLICKHOUSE_VERSION 1.1.53981 - RUN mkdir -p /etc/apt/sources.list.d && \ echo "deb http://repo.yandex.ru/clickhouse/trusty/ dists/stable/main/binary-amd64/" | tee /etc/apt/sources.list.d/clickhouse.list && \ apt-get update && \ - apt-get install --force-yes -y clickhouse-client="$CLICKHOUSE_VERSION" && \ + apt-get install --allow-unauthenticated -y clickhouse-client && \ rm -rf /var/lib/apt/lists/* /var/cache/ -ENV CLICKHOUSE_HOST localhost -ENV CLICKHOUSE_PORT 9000 - -CMD ["sh", "-c", "clickhouse-client --host ${CLICKHOUSE_HOST} --port ${CLICKHOUSE_PORT}"] +ENTRYPOINT ["/usr/bin/clickhouse-client"] diff --git a/docker/server/1.1.53981/Dockerfile b/docker/server/Dockerfile similarity index 82% rename from docker/server/1.1.53981/Dockerfile rename to docker/server/Dockerfile index 74243b1071..f04edb4a94 100644 --- a/docker/server/1.1.53981/Dockerfile +++ b/docker/server/Dockerfile @@ -1,11 +1,9 @@ FROM ubuntu:14.04 -ENV CLICKHOUSE_VERSION 1.1.53981 - RUN mkdir -p /etc/apt/sources.list.d && \ echo "deb http://repo.yandex.ru/clickhouse/trusty/ dists/stable/main/binary-amd64/" | tee /etc/apt/sources.list.d/clickhouse.list && \ apt-get update && \ - apt-get install --force-yes -y clickhouse-server-common="$CLICKHOUSE_VERSION" && \ + apt-get install --allow-unauthenticated -y clickhouse-server-common && \ rm -rf /var/lib/apt/lists/* /var/cache/ RUN chown -R metrika /etc/clickhouse-server/