mirror of
https://github.com/bitnami/containers.git
synced 2026-03-13 14:58:03 +08:00
[bitnami/clickhouse] Release 22.6.9-debian-11-r4 (#10591)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -4,7 +4,7 @@ ARG TARGETARCH
|
|||||||
|
|
||||||
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
|
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
|
||||||
org.opencontainers.image.description="Application packaged by Bitnami" \
|
org.opencontainers.image.description="Application packaged by Bitnami" \
|
||||||
org.opencontainers.image.ref.name="22.6.9-debian-11-r3" \
|
org.opencontainers.image.ref.name="22.6.9-debian-11-r4" \
|
||||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \
|
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \
|
||||||
org.opencontainers.image.title="clickhouse" \
|
org.opencontainers.image.title="clickhouse" \
|
||||||
org.opencontainers.image.vendor="VMware, Inc." \
|
org.opencontainers.image.vendor="VMware, Inc." \
|
||||||
|
|||||||
@@ -78,16 +78,16 @@ clickhouse_copy_mounted_configuration() {
|
|||||||
info "Copying mounted configuration from $CLICKHOUSE_MOUNTED_CONF_DIR"
|
info "Copying mounted configuration from $CLICKHOUSE_MOUNTED_CONF_DIR"
|
||||||
# Copy first the files at the base of the mounted folder to go to ClickHouse
|
# Copy first the files at the base of the mounted folder to go to ClickHouse
|
||||||
# base etc folder
|
# 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
|
# 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
|
# 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
|
# 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
|
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
|
fi
|
||||||
if [[ -d "${CLICKHOUSE_MOUNTED_CONF_DIR}/users.d" ]]; then
|
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
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user