From 39e70655c72a43aa1c1cf66dec139a9db995ef91 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 21 Sep 2022 17:33:55 +0200 Subject: [PATCH] [bitnami/clickhouse] Release 22.8.5-debian-11-r3 (#7299) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/clickhouse/22.8/debian-11/Dockerfile | 2 +- .../debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh | 8 ++++++-- bitnami/clickhouse/README.md | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bitnami/clickhouse/22.8/debian-11/Dockerfile b/bitnami/clickhouse/22.8/debian-11/Dockerfile index f6c283d24bd0..0b098ea6347c 100644 --- a/bitnami/clickhouse/22.8/debian-11/Dockerfile +++ b/bitnami/clickhouse/22.8/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.8.5-debian-11-r2" \ + org.opencontainers.image.ref.name="22.8.5-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." \ diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh b/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh index 1a5b0a10b9d4..f684641e6521 100644 --- a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh +++ b/bitnami/clickhouse/22.8/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 395a7d96a9fe..c1d4b04426ec 100644 --- a/bitnami/clickhouse/README.md +++ b/bitnami/clickhouse/README.md @@ -41,7 +41,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`22.8`, `22.8-debian-11`, `22.8.5`, `22.8.5-debian-11-r2`, `latest` (22.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.8/debian-11/Dockerfile) +* [`22.8`, `22.8-debian-11`, `22.8.5`, `22.8.5-debian-11-r3`, `latest` (22.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.8/debian-11/Dockerfile) * [`22.7`, `22.7-debian-11`, `22.7.5`, `22.7.5-debian-11-r2` (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-r0` (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-r2` (22.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.5/debian-11/Dockerfile)