Skip to content

Commit b1226e6

Browse files
authored
[bitnami/clickhouse] Release clickhouse-25.3.2-debian-12-r2 (#79676)
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
1 parent 967f6c1 commit b1226e6

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

bitnami/clickhouse/25/debian-12/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ ARG TARGETARCH
88

99
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
1010
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
11-
org.opencontainers.image.created="2025-04-05T18:33:13Z" \
11+
org.opencontainers.image.created="2025-04-07T10:22:04Z" \
1212
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
1313
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse/README.md" \
14-
org.opencontainers.image.ref.name="25.3.2-debian-12-r1" \
14+
org.opencontainers.image.ref.name="25.3.2-debian-12-r2" \
1515
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \
1616
org.opencontainers.image.title="clickhouse" \
1717
org.opencontainers.image.vendor="Broadcom, Inc." \

bitnami/clickhouse/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
2525
# variable will be overridden with the value specified in that file
2626
clickhouse_env_vars=(
2727
ALLOW_EMPTY_PASSWORD
28+
CLICKHOUSE_SKIP_USER_SETUP
2829
CLICKHOUSE_ADMIN_USER
2930
CLICKHOUSE_ADMIN_PASSWORD
3031
CLICKHOUSE_HTTP_PORT
@@ -65,6 +66,7 @@ export CLICKHOUSE_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
6566

6667
# ClickHouse configuration parameters
6768
export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}"
69+
export CLICKHOUSE_SKIP_USER_SETUP="${CLICKHOUSE_SKIP_USER_SETUP:-no}"
6870
CLICKHOUSE_ADMIN_USER="${CLICKHOUSE_ADMIN_USER:-"${CLICKHOUSE_USER:-}"}"
6971
export CLICKHOUSE_ADMIN_USER="${CLICKHOUSE_ADMIN_USER:-default}"
7072
CLICKHOUSE_ADMIN_PASSWORD="${CLICKHOUSE_ADMIN_PASSWORD:-"${CLICKHOUSE_PASSWORD:-}"}"

bitnami/clickhouse/25/debian-12/rootfs/opt/bitnami/scripts/libclickhouse.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ clickhouse_validate() {
5454
! is_empty_value "$CLICKHOUSE_INTERSERVER_HTTP_PORT" && check_valid_port "CLICKHOUSE_INTERSERVER_HTTP_PORT"
5555

5656
# Validate credentials
57-
if is_boolean_yes "${ALLOW_EMPTY_PASSWORD:-}"; then
58-
warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD:-}. For safety reasons, do not use this flag in a production environment."
59-
elif is_empty_value "$CLICKHOUSE_ADMIN_PASSWORD"; then
60-
print_validation_error "The CLICKHOUSE_ADMIN_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments."
57+
if ! is_boolean_yes "$CLICKHOUSE_SKIP_USER_SETUP"; then
58+
if is_boolean_yes "${ALLOW_EMPTY_PASSWORD:-}"; then
59+
warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD:-}. For safety reasons, do not use this flag in a production environment."
60+
elif is_empty_value "$CLICKHOUSE_ADMIN_PASSWORD"; then
61+
print_validation_error "The CLICKHOUSE_ADMIN_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments."
62+
fi
6163
fi
6264

6365
return "$error_code"
@@ -191,7 +193,9 @@ clickhouse_initialize() {
191193
rm -f "$CLICKHOUSE_PID_FILE"
192194

193195
clickhouse_copy_mounted_configuration
194-
if [[ "$CLICKHOUSE_ADMIN_USER" != "default" ]]; then
196+
if is_boolean_yes "$CLICKHOUSE_SKIP_USER_SETUP"; then
197+
info "Skipping user setup"
198+
elif [[ "$CLICKHOUSE_ADMIN_USER" != "default" ]]; then
195199
# If we need to set an admin user different from default, we create a configuration override
196200
local -r admin_user_override="${CLICKHOUSE_CONF_DIR}/users.d/__bitnami_default_user.xml"
197201
cat <<EOF >"${admin_user_override}"

bitnami/clickhouse/README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,17 @@ In order to have your custom files inside the docker image you can mount them as
201201

202202
#### Customizable environment variables
203203

204-
| Name | Description | Default Value |
205-
|------------------------------------|-------------------------------|---------------|
206-
| `ALLOW_EMPTY_PASSWORD` | Allow an empty password. | `no` |
207-
| `CLICKHOUSE_ADMIN_USER` | ClickHouse admin username. | `default` |
208-
| `CLICKHOUSE_ADMIN_PASSWORD` | ClickHouse admin password. | `nil` |
209-
| `CLICKHOUSE_HTTP_PORT` | ClickHouse HTTP port. | `8123` |
210-
| `CLICKHOUSE_TCP_PORT` | ClickHouse TCP port. | `9000` |
211-
| `CLICKHOUSE_MYSQL_PORT` | ClickHouse MySQL port. | `9004` |
212-
| `CLICKHOUSE_POSTGRESQL_PORT` | ClickHouse PostgreSQL port. | `9005` |
213-
| `CLICKHOUSE_INTERSERVER_HTTP_PORT` | ClickHouse Inter-server port. | `9009` |
204+
| Name | Description | Default Value |
205+
|------------------------------------|-----------------------------------|---------------|
206+
| `ALLOW_EMPTY_PASSWORD` | Allow an empty password. | `no` |
207+
| `CLICKHOUSE_SKIP_USER_SETUP` | Skip ClickHouse admin user setup. | `no` |
208+
| `CLICKHOUSE_ADMIN_USER` | ClickHouse admin username. | `default` |
209+
| `CLICKHOUSE_ADMIN_PASSWORD` | ClickHouse admin password. | `nil` |
210+
| `CLICKHOUSE_HTTP_PORT` | ClickHouse HTTP port. | `8123` |
211+
| `CLICKHOUSE_TCP_PORT` | ClickHouse TCP port. | `9000` |
212+
| `CLICKHOUSE_MYSQL_PORT` | ClickHouse MySQL port. | `9004` |
213+
| `CLICKHOUSE_POSTGRESQL_PORT` | ClickHouse PostgreSQL port. | `9005` |
214+
| `CLICKHOUSE_INTERSERVER_HTTP_PORT` | ClickHouse Inter-server port. | `9009` |
214215

215216
#### Read-only environment variables
216217

0 commit comments

Comments
 (0)