[bitnami/cassandra] Release 4.0.8-debian-11-r8 (#28128)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Jose Antonio Carmona <jcarmona@vmware.com>

bitnami/cassandra/4.0/debian-11/Dockerfile

@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-04T21:38:54Z" \
+      org.opencontainers.image.created="2023-03-22T16:16:39Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.8-debian-11-r7" \
+      org.opencontainers.image.ref.name="4.0.8-debian-11-r8" \
       org.opencontainers.image.title="cassandra" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.8"
@@ -23,11 +23,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "python-3.9.16-6-linux-${OS_ARCH}-debian-11" \
+      "python-3.9.16-8-linux-${OS_ARCH}-debian-11" \
-      "java-1.8.362-2-linux-${OS_ARCH}-debian-11" \
+      "java-1.8.362-3-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
-      "yq-4.31.2-0-linux-${OS_ARCH}-debian-11" \
+      "yq-4.32.2-0-linux-${OS_ARCH}-debian-11" \
-      "cassandra-4.0.8-1-linux-${OS_ARCH}-debian-11" \
+      "cassandra-4.0.8-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \

bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -1,37 +1,37 @@
 {
     "cassandra": {
         "arch": "amd64",
-        "digest": "e308aab6256bf49eaea4302f43b676bd2f3a3912ab48e72f7112a7ba4c4f1e01",
+        "digest": "acb69840129119d97a4c17426ba3724880407f12d0d84eef011b6c1a0481c706",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.0.8-1"
+        "version": "4.0.8-2"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
+        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-2"
+        "version": "1.16.0-3"
     },
     "java": {
         "arch": "amd64",
-        "digest": "0cb6f9d6d7247b2978176a29d50e6a9ebe853545757decaaaff1899a22ebf12c",
+        "digest": "a01727685913db816e1db77cf4b3e5eeaec8bbba762a9c6d708d0749b2c6a75b",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.8.362-2"
+        "version": "1.8.362-3"
     },
     "python": {
         "arch": "amd64",
-        "digest": "104ad89936f62b3d5b478ef7f8ada24b8232400d7c4d7600e6dff530b4e4032a",
+        "digest": "7356ba4f9823199ca5819c7f814ed7d971c3fe916726bb53d8b929414c5b3e2b",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.9.16-6"
+        "version": "3.9.16-8"
     },
     "yq": {
         "arch": "amd64",
-        "digest": "498dd1e7ac81a0e41ac2761d6708e425bab6cbbf37c93e47ce8df12000e8a4d3",
+        "digest": "e09f11557e4dfd4170495f320d5ce5655c57ac9be844f81f27066cce84c1bad8",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.31.2-0"
+        "version": "4.32.2-0"
     }
 }

bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh

@@ -281,6 +281,8 @@ remove_logrotate_conf() {
 #   --environment - Environment variable to define (multiple --environment options may be passed)
 #   --environment-file - Text file with environment variables
 #   --exec-start - Start command (required)
+#   --exec-start-pre - Pre-start command (optional)
+#   --exec-start-post - Post-start command (optional)
 #   --exec-stop - Stop command (optional)
 #   --exec-reload - Reload command (optional)
 #   --group - System group to start the service with
@@ -292,6 +294,7 @@ remove_logrotate_conf() {
 #   --success-exit-status - Exit code that indicates a successful shutdown
 #   --type - Systemd unit type (defaults to forking)
 #   --user - System user to start the service with
+#   --working-directory - Working directory at which to start the service
 # Returns:
 #   None
 #########################
@@ -307,6 +310,8 @@ generate_systemd_conf() {
     local environment=""
     local environment_file=""
     local exec_start=""
+    local exec_start_pre=""
+    local exec_start_post=""
     local exec_stop=""
     local exec_reload=""
     local restart="always"
@@ -316,6 +321,7 @@ generate_systemd_conf() {
     local limits_content=""
     local success_exit_status=""
     local custom_service_content=""
+    local working_directory=""
     # Parse CLI flags
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -334,6 +340,7 @@ generate_systemd_conf() {
             | --standard-error \
             | --success-exit-status \
             | --custom-service-content \
+            | --working-directory \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
@@ -345,11 +352,21 @@ generate_systemd_conf() {
                 shift
                 limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}"
                 ;;
+            --exec-start-pre)
+                shift
+                [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n'
+                exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}"
+                ;;
+            --exec-start-post)
+                shift
+                [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n'
+                exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}"
+                ;;
             --environment)
                 shift
                 # It is possible to add multiple environment lines
                 [[ -n "$environment" ]] && environment+=$'\n'
-                environment+="Environment=${1:?"environment" is missing}"
+                environment+="Environment=${1:?"--environment value is missing"}"
                 ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
@@ -376,8 +393,21 @@ PartOf=bitnami.service
 
 [Service]
 Type=${type}
-ExecStart=${exec_start}
 EOF
+    if [[ -n "$working_directory" ]]; then
+        cat >> "$service_file" <<< "WorkingDirectory=${working_directory}"
+    fi
+    if [[ -n "$exec_start_pre" ]]; then
+        # This variable may contain multiple ExecStartPre= directives
+        cat >> "$service_file" <<< "$exec_start_pre"
+    fi
+    if [[ -n "$exec_start" ]]; then
+        cat >> "$service_file" <<< "ExecStart=${exec_start}"
+    fi
+    if [[ -n "$exec_start_post" ]]; then
+        # This variable may contain multiple ExecStartPost= directives
+        cat >> "$service_file" <<< "$exec_start_post"
+    fi
     # Optional stop and reload commands
     if [[ -n "$exec_stop" ]]; then
         cat >> "$service_file" <<< "ExecStop=${exec_stop}"
@@ -399,8 +429,9 @@ EOF
     if [[ -n "$restart" ]]; then
         cat >> "$service_file" <<< "Restart=${restart}"
     fi
-    # Environment flags (may be specified multiple times in a unit)
+    # Environment flags
     if [[ -n "$environment" ]]; then
+        # This variable may contain multiple Environment= directives
         cat >> "$service_file" <<< "$environment"
     fi
     if [[ -n "$environment_file" ]]; then
@@ -414,6 +445,7 @@ EOF
         cat >> "$service_file" <<< "StandardError=${standard_error}"
     fi
     if [[ -n "$custom_service_content" ]]; then
+        # This variable may contain multiple miscellaneous directives
         cat >> "$service_file" <<< "$custom_service_content"
     fi
     if [[ -n "$success_exit_status" ]]; then
@@ -424,7 +456,8 @@ EOF
     fi
     cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutSec=5min
+TimeoutStartSec=2min
+TimeoutStopSec=30s
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF

bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/cassandra-env.sh

@@ -90,7 +90,6 @@ export CASSANDRA_VOLUME_DIR="${CASSANDRA_VOLUME_DIR:-/bitnami/cassandra}"
 export CASSANDRA_DATA_DIR="${CASSANDRA_DATA_DIR:-${CASSANDRA_VOLUME_DIR}/data}"
 export CASSANDRA_COMMITLOG_DIR="${CASSANDRA_COMMITLOG_DIR:-${CASSANDRA_DATA_DIR}/commitlog}"
 export CASSANDRA_DEFAULT_CONF_DIR="${CASSANDRA_BASE_DIR}/conf.default"
-export CASSANDRA_HISTORY_DIR="${HOME}/.cassandra"
 export CASSANDRA_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
 export CASSANDRA_LOG_DIR="${CASSANDRA_BASE_DIR}/logs"
 export CASSANDRA_MOUNTED_CONF_DIR="${CASSANDRA_MOUNTED_CONF_DIR:-${CASSANDRA_VOLUME_DIR}/conf}"
@@ -104,7 +103,7 @@ export CASSANDRA_LOG_FILE="${CASSANDRA_LOG_DIR}/cassandra.log"
 export CASSANDRA_FIRST_BOOT_LOG_FILE="${CASSANDRA_LOG_DIR}/cassandra_first_boot.log"
 export CASSANDRA_INITSCRIPTS_BOOT_LOG_FILE="${CASSANDRA_LOG_DIR}/cassandra_init_scripts_boot.log"
 export CASSANDRA_PID_FILE="${CASSANDRA_TMP_DIR}/cassandra.pid"
-export PATH="${CASSANDRA_BIN_DIR}:${JAVA_BIN_DIR}:${PYTHON_BIN_DIR}:${PATH}"
+export PATH="${CASSANDRA_BIN_DIR}:${JAVA_BIN_DIR}:${PYTHON_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
 
 # System users (when running with a privileged user)
 export CASSANDRA_DAEMON_USER="cassandra"

bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh

@@ -9,7 +9,7 @@
 # Load Cassandra environment variables
 . /opt/bitnami/scripts/cassandra-env.sh
 
-for dir in "$CASSANDRA_INITSCRIPTS_DIR" "$CASSANDRA_TMP_DIR" "$CASSANDRA_HISTORY_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_CONF_DIR" "$CASSANDRA_LOG_DIR" "$CASSANDRA_MOUNTED_CONF_DIR" "$CASSANDRA_VOLUME_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
@@ -21,3 +21,6 @@ exec "${PYTHON_BIN_DIR}/python" "${CASSANDRA_BIN_DIR}/cqlsh.py" "\$@"
 EOF
 
 chmod +x "${CASSANDRA_BIN_DIR}/cqlsh"
+
+ensure_dir_exists "${HOME}/.cassandra"
+chmod -R g+rwX "${HOME}/.cassandra"