[bitnami/clickhouse] Release 22.9.4-debian-11-r5 (#12934)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2022-11-08 18:26:07 +01:00
committed by GitHub
parent 272e7e596f
commit 528284ef4c
2 changed files with 4 additions and 4 deletions

View File

@@ -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.9.4-debian-11-r4" \
org.opencontainers.image.ref.name="22.9.4-debian-11-r5" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \
org.opencontainers.image.title="clickhouse" \
org.opencontainers.image.vendor="VMware, Inc." \

View File

@@ -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,l -exec cp -L {} "$CLICKHOUSE_CONF_DIR" \;
find "$CLICKHOUSE_MOUNTED_CONF_DIR" -maxdepth 1 \( -type f -o -type 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,l -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/conf.d" \;
find "${CLICKHOUSE_MOUNTED_CONF_DIR}/conf.d" \( -type f -o -type 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,l -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/users.d" \;
find "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" \( -type f -o -type l \) -exec cp -L {} "${CLICKHOUSE_CONF_DIR}/users.d" \;
fi
fi
else