From cb05fd7362822459917ce7b00dc49535a5810b30 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 29 Jun 2023 19:12:07 +0200
Subject: [PATCH] [bitnami/clickhouse] Release 23.5.4-debian-11-r0 (#39294)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/clickhouse/23/debian-11/Dockerfile    | 10 ++++-----
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libservice.sh         | 22 ++++++++++++++-----
 .../clickhouse/23/debian-11/tags-info.yaml    |  2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/bitnami/clickhouse/23/debian-11/Dockerfile b/bitnami/clickhouse/23/debian-11/Dockerfile
index ce9a6f4f06ec..d01acb06209b 100644
--- a/bitnami/clickhouse/23/debian-11/Dockerfile
+++ b/bitnami/clickhouse/23/debian-11/Dockerfile
@@ -6,13 +6,13 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-06-27T03:29:27Z" \
+      org.opencontainers.image.created="2023-06-29T16:49:59Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="23.5.3-debian-11-r3" \
+      org.opencontainers.image.ref.name="23.5.4-debian-11-r0" \
       org.opencontainers.image.title="clickhouse" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="23.5.3"
+      org.opencontainers.image.version="23.5.4"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -25,7 +25,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps xmlstarlet
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "clickhouse-23.5.3-0-linux-${OS_ARCH}-debian-11" \
+      "clickhouse-23.5.4-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -43,7 +43,7 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/clickhouse/postunpack.sh
-ENV APP_VERSION="23.5.3" \
+ENV APP_VERSION="23.5.4" \
     BITNAMI_APP_NAME="clickhouse" \
     PATH="/opt/bitnami/clickhouse/bin:/opt/bitnami/common/bin:$PATH" \
     clickhouseCTL_API="3"
diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 13b6c3fcff22..f4eecdcb7d35 100644
--- a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "23.5.3-0"
+        "version": "23.5.4-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 08fffa531ef1..107f54e6b5c9 100644
--- a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -106,8 +106,6 @@ generate_cron_conf() {
     local schedule="* * * * *"
     local clean="true"
 
-    local clean="true"
-
     # Parse optional CLI flags
     shift 2
     while [[ "$#" -gt 0 ]]; do
@@ -133,7 +131,12 @@ generate_cron_conf() {
 
     mkdir -p /etc/cron.d
     if "$clean"; then
-        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+        cat > "/etc/cron.d/${service_name}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
+${schedule} ${run_as} ${cmd}
+EOF
     else
         echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
     fi
@@ -189,7 +192,10 @@ generate_monit_conf() {
 
     is_boolean_yes "$disabled" && conf_suffix=".disabled"
     mkdir -p "$monit_conf_dir"
-    cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 check process ${service_name}
   with pidfile "${pid_file}"
   start program = "${start_command}" with timeout 90 seconds
@@ -248,7 +254,10 @@ generate_logrotate_conf() {
     done
 
     mkdir -p "$logrotate_conf_dir"
-    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
+    cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 ${log_path} {
   ${period}
   rotate ${rotations}
@@ -393,6 +402,9 @@ generate_systemd_conf() {
     fi
     # Generate the Systemd unit
     cat > "$service_file" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 [Unit]
 Description=Bitnami service for ${name}
 # Starting/stopping the main bitnami service should cause the same effect for this service
diff --git a/bitnami/clickhouse/23/debian-11/tags-info.yaml b/bitnami/clickhouse/23/debian-11/tags-info.yaml
index 6cc93586f68b..2f67a9f3be30 100644
--- a/bitnami/clickhouse/23/debian-11/tags-info.yaml
+++ b/bitnami/clickhouse/23/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "23"
 - 23-debian-11
-- 23.5.3
+- 23.5.4
 - latest