diff --git a/bitnami/cassandra/4.1/debian-12/Dockerfile b/bitnami/cassandra/4.1/debian-12/Dockerfile index d711a4acd161..8d5a90ae39b0 100644 --- a/bitnami/cassandra/4.1/debian-12/Dockerfile +++ b/bitnami/cassandra/4.1/debian-12/Dockerfile @@ -3,16 +3,17 @@ FROM docker.io/bitnami/minideb:bookworm +ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" 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-26T21:46:33Z" \ + org.opencontainers.image.created="2024-10-24T13:47:34Z" \ 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.1.7-debian-12-r0" \ + org.opencontainers.image.ref.name="4.1.7-debian-12-r1" \ 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,14 +30,14 @@ 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.10-5-linux-${OS_ARCH}-debian-12" \ - "java-11.0.24-9-1-linux-${OS_ARCH}-debian-12" \ - "cassandra-4.1.7-0-linux-${OS_ARCH}-debian-12" \ + "python-3.11.10-8-linux-${OS_ARCH}-debian-12" \ + "java-11.0.25-11-0-linux-${OS_ARCH}-debian-12" \ + "cassandra-4.1.7-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ fi ; \ sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ diff --git a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 5b1388b12457..e67a67c0b43b 100644 --- a/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cassandra/4.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "4.1.7-0" + "version": "4.1.7-1" }, "java": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "11.0.24-9-1" + "version": "11.0.25-11-0" }, "python": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.11.10-5" + "version": "3.11.10-8" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh index d48e6fe856bd..3acce795b328 100755 --- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh +++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/cassandra/postunpack.sh @@ -11,6 +11,12 @@ # Load Cassandra environment variables . /opt/bitnami/scripts/cassandra-env.sh +# Starting with version 5.0.2, we found that the Cassandra official configuration +# was in a file called cassandra_latest.yaml. We copy that file to ensure that it is using +# the latest settings +if [[ -f "${DB_DEFAULT_CONF_DIR}/cassandra_latest.yaml" ]]; then + cp "${DB_DEFAULT_CONF_DIR}/cassandra_latest.yaml" "${DB_DEFAULT_CONF_DIR}/cassandra.yaml" +fi for dir in "$DB_INITSCRIPTS_DIR" "$DB_TMP_DIR" "$DB_LOG_DIR" "$DB_MOUNTED_CONF_DIR" "$DB_VOLUME_DIR"; do ensure_dir_exists "$dir" diff --git a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh index 906441974dc5..dcce53075b8a 100644 --- a/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh +++ b/bitnami/cassandra/4.1/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh @@ -572,11 +572,12 @@ cassandra_enable_auth() { cassandra_yaml_set "authorizer" "AllowAllAuthorizer" 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}" + replace_in_file "${DB_CONF_FILE}" "class_name.* AllowAllAuthenticator" "class_name: ${DB_AUTHENTICATOR}" + replace_in_file "${DB_CONF_FILE}" "class_name.* AllowAllAuthorizer" "class_name: ${DB_AUTHORIZER}" else cassandra_yaml_set "authenticator" "${DB_AUTHENTICATOR}" + cassandra_yaml_set "authorizer" "${DB_AUTHORIZER}" fi - cassandra_yaml_set "authorizer" "${DB_AUTHORIZER}" fi else debug "${DB_MOUNTED_CONF_PATH} mounted. Skipping authentication method configuration"