From 75ffb680db91efbc477097ee8f191a1f7a4348f0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 24 Sep 2022 16:15:45 +0200 Subject: [PATCH] [bitnami/clickhouse] Release 22.3.12-debian-11-r3 (#7784) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/clickhouse/22.3/debian-11/Dockerfile | 4 ++-- .../rootfs/opt/bitnami/scripts/clickhouse-env.sh | 2 +- .../debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh | 8 ++++++-- bitnami/clickhouse/README.md | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bitnami/clickhouse/22.3/debian-11/Dockerfile b/bitnami/clickhouse/22.3/debian-11/Dockerfile index d3427c695a40..5c8d8839c664 100644 --- a/bitnami/clickhouse/22.3/debian-11/Dockerfile +++ b/bitnami/clickhouse/22.3/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="22.3.12-debian-11-r2" \ + org.opencontainers.image.ref.name="22.3.12-debian-11-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \ org.opencontainers.image.title="clickhouse" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -18,7 +18,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl gzip procps tar xmlstarlet +RUN install_packages ca-certificates curl procps xmlstarlet RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ diff --git a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh index 2df2e8247bc8..351f6384f3d3 100644 --- a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh +++ b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh @@ -75,6 +75,6 @@ export CLICKHOUSE_INTERSERVER_HTTP_PORT="${CLICKHOUSE_INTERSERVER_HTTP_PORT:-900 # ClickHouse system parameters export CLICKHOUSE_DAEMON_USER="clickhouse" export CLICKHOUSE_DAEMON_GROUP="bitnami" -export PATH="${CLICKHOUSE_BASE_DIR}/venv/bin:$PATH" +export PATH="${CLICKHOUSE_BASE_DIR}/bin:${BITNAMI_ROOT_DIR}/common/bin:$PATH" # Custom environment variables may be defined below diff --git a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh index 1a5b0a10b9d4..f684641e6521 100644 --- a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh +++ b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh @@ -83,8 +83,12 @@ clickhouse_copy_mounted_configuration() { # The ClickHouse override directories (etc/conf.d and etc/users.d) do not support subfolders. That means we cannot # copy directly with cp -RL because we need all override xml files to have at the root of these subfolders. In the helm # chart we want to allow overrides from different ConfigMaps and Secrets so we need to use the find command - [[ -d "${CLICKHOUSE_MOUNTED_CONF_DIR}/conf.d" ]] && find "${CLICKHOUSE_MOUNTED_CONF_DIR}/conf.d" -type f -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/conf.d" \; - [[ -d "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" ]] && find "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" -type f -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/users.d" \; + if [[ -d "${CLICKHOUSE_MOUNTED_CONF_DIR}/conf.d" ]]; then + find "${CLICKHOUSE_MOUNTED_CONF_DIR}/conf.d" -type f -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/conf.d" \; + fi + if [[ -d "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" ]]; then + find "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" -type f -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/users.d" \; + fi fi else warn "The folder $CLICKHOUSE_CONF_DIR is not writable. This is likely because a read-only filesystem was mounted in that folder. Using $CLICKHOUSE_MOUNTED_DIR is recommended" diff --git a/bitnami/clickhouse/README.md b/bitnami/clickhouse/README.md index 3f968dda4b33..43e6bbcbfb5d 100644 --- a/bitnami/clickhouse/README.md +++ b/bitnami/clickhouse/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`22.7`, `22.7-debian-11`, `22.7.5`, `22.7.5-debian-11-r3` (22.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.7/debian-11/Dockerfile) * [`22.6`, `22.6-debian-11`, `22.6.8`, `22.6.8-debian-11-r1` (22.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.6/debian-11/Dockerfile) * [`22.5`, `22.5-debian-11`, `22.5.4`, `22.5.4-debian-11-r3` (22.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.5/debian-11/Dockerfile) -* [`22.3`, `22.3-debian-11`, `22.3.12`, `22.3.12-debian-11-r2` (22.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.3/debian-11/Dockerfile) +* [`22.3`, `22.3-debian-11`, `22.3.12`, `22.3.12-debian-11-r3` (22.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.3/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).