mirror of
https://github.com/bitnami/containers.git
synced 2026-10-18 08:12:12 +02:00
[bitnami/clickhouse] Release 23.8.9-debian-11-r24 (#62110)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -7,10 +7,10 @@ ARG TARGETARCH
|
||||
|
||||
LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
|
||||
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
|
||||
org.opencontainers.image.created="2024-02-16T16:24:39Z" \
|
||||
org.opencontainers.image.created="2024-02-19T14:57:35Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="23.8.9-debian-11-r23" \
|
||||
org.opencontainers.image.ref.name="23.8.9-debian-11-r24" \
|
||||
org.opencontainers.image.title="clickhouse" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="23.8.9"
|
||||
|
||||
@@ -52,6 +52,7 @@ unset clickhouse_env_vars
|
||||
export CLICKHOUSE_BASE_DIR="${BITNAMI_ROOT_DIR}/clickhouse"
|
||||
export CLICKHOUSE_VOLUME_DIR="/bitnami/clickhouse"
|
||||
export CLICKHOUSE_CONF_DIR="${CLICKHOUSE_BASE_DIR}/etc"
|
||||
export CLICKHOUSE_DEFAULT_CONF_DIR="${CLICKHOUSE_BASE_DIR}/etc.default"
|
||||
export CLICKHOUSE_MOUNTED_CONF_DIR="${CLICKHOUSE_VOLUME_DIR}/etc"
|
||||
export CLICKHOUSE_DATA_DIR="${CLICKHOUSE_VOLUME_DIR}/data"
|
||||
export CLICKHOUSE_LOG_DIR="${CLICKHOUSE_BASE_DIR}/logs"
|
||||
|
||||
@@ -18,6 +18,12 @@ set -o pipefail
|
||||
|
||||
print_welcome_page
|
||||
|
||||
# We add the copy from default config in the entrypoint to not break users
|
||||
# bypassing the setup.sh logic. If the file already exists do not overwrite (in
|
||||
# case someone mounts a configuration file in /opt/bitnami/clickhouse/etc)
|
||||
debug "Copying files from $CLICKHOUSE_DEFAULT_CONF_DIR to $CLICKHOUSE_CONF_DIR"
|
||||
cp -nr "$CLICKHOUSE_DEFAULT_CONF_DIR"/. "$CLICKHOUSE_CONF_DIR"
|
||||
|
||||
if [[ "$1" = "/opt/bitnami/scripts/clickhouse/run.sh" ]]; then
|
||||
info "** Starting ClickHouse setup **"
|
||||
/opt/bitnami/scripts/clickhouse/setup.sh
|
||||
|
||||
+5
-1
@@ -20,7 +20,7 @@ set -o pipefail
|
||||
ensure_user_exists "$CLICKHOUSE_DAEMON_USER" --group "$CLICKHOUSE_DAEMON_GROUP" --system
|
||||
|
||||
# Create directories
|
||||
for dir in "$CLICKHOUSE_DATA_DIR" "$CLICKHOUSE_CONF_DIR" "${CLICKHOUSE_CONF_DIR}/conf.d" "${CLICKHOUSE_CONF_DIR}/users.d" "$CLICKHOUSE_LOG_DIR" "$CLICKHOUSE_TMP_DIR" "$CLICKHOUSE_MOUNTED_CONF_DIR" "/docker-entrypoint-startdb.d" "/docker-entrypoint-initdb.d"; do
|
||||
for dir in "$CLICKHOUSE_DATA_DIR" "$CLICKHOUSE_CONF_DIR" "${CLICKHOUSE_CONF_DIR}/conf.d" "${CLICKHOUSE_CONF_DIR}/users.d" "$CLICKHOUSE_DEFAULT_CONF_DIR" "$CLICKHOUSE_LOG_DIR" "$CLICKHOUSE_TMP_DIR" "$CLICKHOUSE_MOUNTED_CONF_DIR" "/docker-entrypoint-startdb.d" "/docker-entrypoint-initdb.d"; do
|
||||
ensure_dir_exists "$dir"
|
||||
configure_permissions_ownership "$dir" -d "775" -f "664" -u "$CLICKHOUSE_DAEMON_USER" -g "root"
|
||||
done
|
||||
@@ -78,3 +78,7 @@ chmod g+rw /.clickhouse-client-history
|
||||
xmlstarlet ed -L -d "/clickhouse/logger/log" "$CLICKHOUSE_CONF_FILE"
|
||||
xmlstarlet ed -L -d "/clickhouse/logger/errorlog" "$CLICKHOUSE_CONF_FILE"
|
||||
clickhouse_conf_set "/clickhouse/logger/console" "1"
|
||||
|
||||
# Copy all initially generated configuration files to the default directory
|
||||
# (this is to avoid breaking when entrypoint is being overridden)
|
||||
cp -r "${CLICKHOUSE_CONF_DIR}/"* "$CLICKHOUSE_DEFAULT_CONF_DIR"
|
||||
Reference in New Issue
Block a user