From ce8a59d9fe536bbadbdf6746c86953fff9c863a6 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 19 Oct 2022 01:51:54 +0200 Subject: [PATCH] [bitnami/clickhouse] Release 22.3.13-debian-11-r6 (#10550) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/clickhouse/22.3/debian-11/Dockerfile | 2 +- .../debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/clickhouse/22.3/debian-11/Dockerfile b/bitnami/clickhouse/22.3/debian-11/Dockerfile index 6850a8ca8523..3a7a0e5a4a4e 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.13-debian-11-r5" \ + org.opencontainers.image.ref.name="22.3.13-debian-11-r6" \ 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.3/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh index f684641e6521..e7f4bfb6b32f 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 @@ -78,16 +78,16 @@ clickhouse_copy_mounted_configuration() { info "Copying mounted configuration from $CLICKHOUSE_MOUNTED_CONF_DIR" # Copy first the files at the base of the mounted folder to go to ClickHouse # base etc folder - find "$CLICKHOUSE_MOUNTED_CONF_DIR" -maxdepth 1 -type f -exec cp -L {} "$CLICKHOUSE_CONF_DIR" \; + find "$CLICKHOUSE_MOUNTED_CONF_DIR" -maxdepth 1 -type f,l -exec cp -L {} "$CLICKHOUSE_CONF_DIR" \; # 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 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" \; + find "${CLICKHOUSE_MOUNTED_CONF_DIR}/conf.d" -type f,l -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" \; + find "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" -type f,l -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/users.d" \; fi fi else