From 46bf2b71a4cc1d33e774879a083d6e2f589e34f9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 9 Sep 2024 17:28:51 +0200 Subject: [PATCH] [bitnami/cassandra] Release cassandra-4.0.13-debian-12-r14 (#72288) Signed-off-by: Bitnami Bot --- bitnami/cassandra/4.0/debian-12/Dockerfile | 8 ++--- .../opt/bitnami/.bitnami_components.json | 4 +-- .../opt/bitnami/scripts/libcassandra.sh | 32 ++++++++++++++++--- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/bitnami/cassandra/4.0/debian-12/Dockerfile b/bitnami/cassandra/4.0/debian-12/Dockerfile index a61cefaa9d61..b7a6d5d5e3ad 100644 --- a/bitnami/cassandra/4.0/debian-12/Dockerfile +++ b/bitnami/cassandra/4.0/debian-12/Dockerfile @@ -8,11 +8,11 @@ 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-09-06T02:41:12Z" \ + org.opencontainers.image.created="2024-09-09T14:47:05Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/cassandra/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.13-debian-12-r13" \ + org.opencontainers.image.ref.name="4.0.13-debian-12-r14" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -29,9 +29,9 @@ 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.9-13-linux-${OS_ARCH}-debian-12" \ + "python-3.11.10-1-linux-${OS_ARCH}-debian-12" \ "java-11.0.24-9-1-linux-${OS_ARCH}-debian-12" \ - "cassandra-4.0.13-3-linux-${OS_ARCH}-debian-12" \ + "cassandra-4.0.13-4-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 a28a3c5a732e..68310e5e077b 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 @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "4.0.13-3" + "version": "4.0.13-4" }, "java": { "arch": "amd64", @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.11.9-13" + "version": "3.11.10-1" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh index 8cceb4b5569e..906441974dc5 100644 --- a/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh +++ b/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh @@ -228,6 +228,22 @@ cassandra_stop() { . /opt/bitnami/scripts/libnet.sh . /opt/bitnami/scripts/libservice.sh . /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libversion.sh + +######################## +# Returns cassandra major version +# Globals: +# CASSANDRA_BASE_DIR +# Arguments: +# None +# Returns: +# None +######################### +cassandra_get_major_version() { + cassandra_version="$("${CASSANDRA_BASE_DIR}/bin/cassandra" -v)" + major_version="$(get_sematic_version "$cassandra_version" 1)" + echo "${major_version:-0}" +} ######################## # Change a Cassandra configuration yaml file by setting a property @@ -248,9 +264,9 @@ cassandra_yaml_set() { local -r conf_file="${4:-$DB_CONF_FILE}" if is_boolean_yes "$use_quotes"; then - replace_in_file "$conf_file" "^(#\s)?(\s*)(\-\s*)?${property}:.*" "\2\3${property}: '${value}'" + replace_in_file "$conf_file" "^(\s*)(#\s*)?(\s*)(\-\s*)?${property}:.*" "\1\3\4${property}: '${value}'" else - replace_in_file "$conf_file" "^(#\s)?(\s*)(\-\s*)?${property}:.*" "\2\3${property}: ${value}" + replace_in_file "$conf_file" "^(\s*)(#\s*)?(\s*)(\-\s*)?${property}:.*" "\1\3\4${property}: ${value}" fi } @@ -550,10 +566,16 @@ cassandra_setup_data_dirs() { cassandra_enable_auth() { if ! cassandra_is_file_external "${DB_MOUNTED_CONF_PATH}"; then if [[ "$ALLOW_EMPTY_PASSWORD" = "yes" ]] && [[ -z $DB_PASSWORD ]]; then - cassandra_yaml_set "authenticator" "AllowAllAuthenticator" + if [[ "$DB_FLAVOR" = "scylladb" ]] || [ "$(cassandra_get_major_version)" -lt 5 ]; then + cassandra_yaml_set "authenticator" "AllowAllAuthenticator" + fi cassandra_yaml_set "authorizer" "AllowAllAuthorizer" - else - cassandra_yaml_set "authenticator" "${DB_AUTHENTICATOR}" + else + if [[ "$DB_FLAVOR" = "cassandra" ]] && [ "$(cassandra_get_major_version)" -ge 5 ]; then + replace_in_file "${DB_CONF_FILE}" "class_name : org.apache.cassandra.auth.AllowAllAuthenticator" "class_name : org.apache.cassandra.auth.${DB_AUTHENTICATOR}" + else + cassandra_yaml_set "authenticator" "${DB_AUTHENTICATOR}" + fi cassandra_yaml_set "authorizer" "${DB_AUTHORIZER}" fi else