From 0fab25503e5c7e9e316c0cd30412a6b5622f8f0c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 26 Mar 2024 10:32:11 +0100
Subject: [PATCH] [bitnami/cassandra] Release 4.0.12-debian-12-r9 (#64135)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/cassandra/4.0/debian-12/Dockerfile                | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 2 +-
 .../prebuildfs/opt/bitnami/scripts/libbitnami.sh          | 1 +
 .../rootfs/opt/bitnami/scripts/cassandra/postunpack.sh    | 8 +++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bitnami/cassandra/4.0/debian-12/Dockerfile b/bitnami/cassandra/4.0/debian-12/Dockerfile
index 7a5b1385ad31..d1dd421db7b3 100644
--- a/bitnami/cassandra/4.0/debian-12/Dockerfile
+++ b/bitnami/cassandra/4.0/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-03-07T09:45:00Z" \
+      org.opencontainers.image.created="2024-03-26T08:41:54Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.12-debian-12-r8" \
+      org.opencontainers.image.ref.name="4.0.12-debian-12-r9" \
       org.opencontainers.image.title="cassandra" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.12"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi8 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl3 libtinfo6 libtirpc3 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "python-3.11.8-3-linux-${OS_ARCH}-debian-12" \
+      "python-3.11.8-4-linux-${OS_ARCH}-debian-12" \
       "java-11.0.22-12-2-linux-${OS_ARCH}-debian-12" \
       "cassandra-4.0.12-11-linux-${OS_ARCH}-debian-12" \
     ) ; \
diff --git a/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 177f8f3e47cf..ea59f156f481 100644
--- a/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.11.8-3"
+        "version": "3.11.8-4"
     }
 }
\ No newline at end of file
diff --git a/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 3853c789b2ea..aa782fc6a4db 100644
--- a/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -48,6 +48,7 @@ print_image_welcome_page() {
     info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
     info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
     info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
+    info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}"
     info ""
 }
 
diff --git a/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh b/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh
index e4287dd36b70..e50106d39d23 100755
--- a/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh
+++ b/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh
@@ -11,11 +11,17 @@
 # Load Cassandra environment variables
 . /opt/bitnami/scripts/cassandra-env.sh
 
-for dir in "$CASSANDRA_INITSCRIPTS_DIR" "$CASSANDRA_TMP_DIR" "$CASSANDRA_CONF_DIR" "$CASSANDRA_LOG_DIR" "$CASSANDRA_MOUNTED_CONF_DIR" "$CASSANDRA_VOLUME_DIR"; do
+
+for dir in "$CASSANDRA_INITSCRIPTS_DIR" "$CASSANDRA_TMP_DIR" "$CASSANDRA_LOG_DIR" "$CASSANDRA_MOUNTED_CONF_DIR" "$CASSANDRA_VOLUME_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
 
+# Copy configuration files for the scripts to work
+ensure_dir_exists "$CASSANDRA_CONF_DIR"
+cassandra_copy_default_config
+chmod -R g+rwX "$CASSANDRA_CONF_DIR"
+
 # Create wrapper for cqlsh
 cat <<EOF >"${CASSANDRA_BIN_DIR}/cqlsh"
 #!/bin/sh