From ab1eaf10446e2a5ab468fd8e200f2b0b5ce5ccdb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 17 Jan 2023 15:44:41 +0100
Subject: [PATCH] [bitnami/clickhouse] Release 22.3.17-debian-11-r2 (#20562)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/clickhouse/22.3/debian-11/Dockerfile                  | 4 ++--
 .../debian-11/prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++--
 .../debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh    | 2 +-
 .../rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bitnami/clickhouse/22.3/debian-11/Dockerfile b/bitnami/clickhouse/22.3/debian-11/Dockerfile
index ec4242c7b4f3..9b226d16dc2a 100644
--- a/bitnami/clickhouse/22.3/debian-11/Dockerfile
+++ b/bitnami/clickhouse/22.3/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="22.3.17-debian-11-r1" \
+      org.opencontainers.image.ref.name="22.3.17-debian-11-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \
       org.opencontainers.image.title="clickhouse" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -23,7 +23,7 @@ RUN install_packages ca-certificates curl procps xmlstarlet
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "gosu-1.16.0-0-linux-${OS_ARCH}-debian-11" \
-      "clickhouse-22.3.17-0-linux-${OS_ARCH}-debian-11" \
+      "clickhouse-22.3.17-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/clickhouse/22.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/22.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index a4459f633932..f32b5907a565 100644
--- a/bitnami/clickhouse/22.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/clickhouse/22.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,10 +1,10 @@
 {
     "clickhouse": {
         "arch": "amd64",
-        "digest": "2ec48745778b14a197a5f4f7edd983da86197c3df1ee125c8b694b6ced09b842",
+        "digest": "813a45ba28b691569fe076ea3290416d9bc92da126f4f95c14d1b8d1730baf9b",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "22.3.17-0"
+        "version": "22.3.17-1"
     },
     "gosu": {
         "arch": "amd64",
diff --git a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh
index 351f6384f3d3..f8d18b2b13e8 100644
--- a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh
+++ b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh
@@ -74,7 +74,7 @@ export CLICKHOUSE_INTERSERVER_HTTP_PORT="${CLICKHOUSE_INTERSERVER_HTTP_PORT:-900
 
 # ClickHouse system parameters
 export CLICKHOUSE_DAEMON_USER="clickhouse"
-export CLICKHOUSE_DAEMON_GROUP="bitnami"
+export CLICKHOUSE_DAEMON_GROUP="clickhouse"
 export PATH="${CLICKHOUSE_BASE_DIR}/bin:${BITNAMI_ROOT_DIR}/common/bin:$PATH"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh
index 5b083ed1b314..e7acc3077353 100755
--- a/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh
+++ b/bitnami/clickhouse/22.3/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh
@@ -20,7 +20,7 @@ ensure_user_exists "$CLICKHOUSE_DAEMON_USER" --group "$CLICKHOUSE_DAEMON_GROUP"
 # 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
     ensure_dir_exists "$dir"
-    chmod -R g+rwX "$dir"
+    configure_permissions_ownership "$dir" -d "775" -f "664" -u "$CLICKHOUSE_DAEMON_USER" -g "root"
 done
 
 # Set default settings in the configuration file