[bitnami/cassandra] Release 4.1.1-debian-11-r7 (#32529)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2026-03-16 06:49:12 +08:00 · 2023-05-03 09:28:33 +01:00
parent 4772d304c2
commit 9076d6d21f
6 changed files with 118 additions and 29 deletions
--- a/bitnami/cassandra/4.1/debian-11/Dockerfile
+++ b/bitnami/cassandra/4.1/debian-11/Dockerfile
@@ -3,11 +3,12 @@ FROM docker.io/bitnami/minideb:bullseye
 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-04-08T18:35:03Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-05-03T07:54:35Z" \
      org.opencontainers.image.description="Application packaged by VMware, Inc" \
      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.1.1-debian-11-r6" \
+      org.opencontainers.image.ref.name="4.1.1-debian-11-r7" \
      org.opencontainers.image.title="cassandra" \
      org.opencontainers.image.vendor="VMware, Inc." \
      org.opencontainers.image.version="4.1.1"
@@ -23,10 +24,9 @@ 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-9-linux-${OS_ARCH}-debian-11" \
+      "python-3.9.16-11-linux-${OS_ARCH}-debian-11" \
      "java-1.8.362-4-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
-      "yq-4.33.2-0-linux-${OS_ARCH}-debian-11" \
+      "yq-4.33.3-0-linux-${OS_ARCH}-debian-11" \
      "cassandra-4.1.1-2-linux-${OS_ARCH}-debian-11" \
    ) && \
    for COMPONENT in "${COMPONENTS[@]}"; do \
--- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -5,12 +5,6 @@
        "type": "NAMI",
        "version": "4.1.1-2"
    },
-    "gosu": {
-        "arch": "amd64",
-        "distro": "debian-11",
-        "type": "NAMI",
-        "version": "1.16.0-5"
-    },
    "java": {
        "arch": "amd64",
        "distro": "debian-11",
@@ -21,12 +15,12 @@
        "arch": "amd64",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "3.9.16-9"
+        "version": "3.9.16-11"
    },
    "yq": {
        "arch": "amd64",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "4.33.2-0"
+        "version": "4.33.3-0"
    }
 }
--- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -553,3 +553,98 @@ get_root_disk_device_id() {
 get_root_disk_size() {
    fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
 }
+
+########################
+# Run command as a specific user and group (optional)
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Returns:
+#   Exit code of the specified command
+#########################
+run_as_user() {
+    run_chroot "$@"
+}
+
+########################
+# Execute command as a specific user and group (optional),
+# replacing the current process image
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Returns:
+#   Exit code of the specified command
+#########################
+exec_as_user() {
+    run_chroot --replace-process "$@"
+}
+
+########################
+# Run a command using chroot
+# Arguments:
+#   $1 - USER(:GROUP) to switch to
+#   $2..$n - command to execute
+# Flags:
+#   -r | --replace-process - Replace the current process image (optional)
+# Returns:
+#   Exit code of the specified command
+#########################
+run_chroot() {
+    local userspec
+    local user
+    local homedir
+    local replace=false
+    local -r cwd="$(pwd)"
+
+    # Parse and validate flags
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            -r | --replace-process)
+                replace=true
+                ;;
+            --)
+                shift
+                break
+                ;;
+            -*)
+                stderr_print "unrecognized flag $1"
+                return 1
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
+
+    # Parse and validate arguments
+    if [[ "$#" -lt 2 ]]; then
+        echo "expected at least 2 arguments"
+        return 1
+    else
+        userspec=$1
+        shift
+
+        # userspec can optionally include the group, so we parse the user
+        user=$(echo "$userspec" | cut -d':' -f1)
+    fi
+
+    if ! am_i_root; then
+        error "Could not switch to '${userspec}': Operation not permitted"
+        return 1
+    fi
+
+    # Get the HOME directory for the user to switch, as chroot does
+    # not properly update this env and some scripts rely on it
+    homedir=$(eval echo "~${user}")
+    if [[ ! -d $homedir ]]; then
+        homedir="${HOME:-/}"
+    fi
+
+    # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion
+    if [[ "$replace" = true ]]; then
+        exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
+    else
+        chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
+    fi
+}
--- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,10 +112,10 @@ is_web_server_running() {
 #########################
 web_server_start() {
    info "Starting $(web_server_type) in background"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
        systemctl start "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
    fi
 }

@@ -130,10 +130,10 @@ web_server_start() {
 #########################
 web_server_stop() {
    info "Stopping $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
        systemctl stop "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
    fi
 }

@@ -148,10 +148,10 @@ web_server_stop() {
 #########################
 web_server_restart() {
    info "Restarting $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
        systemctl restart "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
    fi
 }

@@ -165,10 +165,10 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
        systemctl reload "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
    fi
 }

--- a/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh
+++ b/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh
@@ -53,7 +53,7 @@ if is_cassandra_running; then
    readonly __run_tail_flags=("--pid=${__run_pid}" "-n" "1000" "-f" "$running_log_file")

    if am_i_root; then
-        exec gosu "$CASSANDRA_DAEMON_USER" "${__run_tail_cmd}" "${__run_tail_flags[@]}"
+        exec_as_user "$CASSANDRA_DAEMON_USER" "${__run_tail_cmd}" "${__run_tail_flags[@]}"
    else
        exec "${__run_tail_cmd}" "${__run_tail_flags[@]}"
    fi
@@ -61,7 +61,7 @@ else
    readonly __run_cmd="${CASSANDRA_BIN_DIR}/cassandra"
    readonly __run_flags=("-p $CASSANDRA_PID_FILE" "-R" "-f")
    if am_i_root; then
-        exec gosu "$CASSANDRA_DAEMON_USER" "${__run_cmd}" "${__run_flags[@]}"
+        exec_as_user "$CASSANDRA_DAEMON_USER" "${__run_cmd}" "${__run_flags[@]}"
    else
        exec "${__run_cmd}" "${__run_flags[@]}"
    fi
--- a/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
+++ b/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
@@ -997,7 +997,7 @@ cassandra_start_bg() {
    local -r args=("-p" "$CASSANDRA_PID_FILE" "-R" "-f")

    if am_i_root; then
-        gosu "$CASSANDRA_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$logger" 2>&1 &
+        run_as_user "$CASSANDRA_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$logger" 2>&1 &
    else
        "${cmd[@]}" "${args[@]}" >"$logger" 2>&1 &
    fi