From f3c3455889b12865cc188365f0e4f3a2431b0932 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 11 Feb 2023 00:19:52 +0100 Subject: [PATCH] [bitnami/cassandra] Release 4.0.7-debian-11-r35 (#23581) Signed-off-by: Bitnami Containers --- bitnami/cassandra/4.0/debian-11/Dockerfile | 4 ++-- .../prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++-- .../debian-11/rootfs/opt/bitnami/scripts/cassandra-env.sh | 4 ++++ .../debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh | 5 +++++ bitnami/cassandra/4.0/debian-11/tags-info.yaml | 6 +++--- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bitnami/cassandra/4.0/debian-11/Dockerfile b/bitnami/cassandra/4.0/debian-11/Dockerfile index dda750ecdf40..11fb19e39799 100644 --- a/bitnami/cassandra/4.0/debian-11/Dockerfile +++ b/bitnami/cassandra/4.0/debian-11/Dockerfile @@ -6,7 +6,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.7-debian-11-r34" \ + org.opencontainers.image.ref.name="4.0.7-debian-11-r35" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -23,7 +23,7 @@ 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-2-linux-${OS_ARCH}-debian-11" \ + "python-3.9.16-3-linux-${OS_ARCH}-debian-11" \ "java-1.8.362-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \ "yq-4.30.8-1-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7cda59d66c71..e839c9907b54 100644 --- a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -22,10 +22,10 @@ }, "python": { "arch": "amd64", - "digest": "22236e812fefd68d6a3ef5b9357b6318a89fce240b59006e82fe2e931f5faaa5", + "digest": "dc98177aa6bb38b1df12fbc42b826ef1ced23b3620355832f905454a7c67b617", "distro": "debian-11", "type": "NAMI", - "version": "3.9.16-2" + "version": "3.9.16-3" }, "yq": { "arch": "amd64", diff --git a/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/cassandra-env.sh b/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/cassandra-env.sh index 221d05c4efbb..5dd5901d655d 100644 --- a/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/cassandra-env.sh +++ b/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/cassandra-env.sh @@ -56,6 +56,7 @@ cassandra_env_vars=( CASSANDRA_INIT_SLEEP_TIME CASSANDRA_PEER_CQL_MAX_RETRIES CASSANDRA_PEER_CQL_SLEEP_TIME + CASSANDRA_AUTO_SNAPSHOT_TTL ALLOW_EMPTY_PASSWORD CASSANDRA_AUTHORIZER CASSANDRA_AUTHENTICATOR @@ -147,6 +148,9 @@ export CASSANDRA_INIT_SLEEP_TIME="${CASSANDRA_INIT_SLEEP_TIME:-5}" export CASSANDRA_PEER_CQL_MAX_RETRIES="${CASSANDRA_PEER_CQL_MAX_RETRIES:-100}" export CASSANDRA_PEER_CQL_SLEEP_TIME="${CASSANDRA_PEER_CQL_SLEEP_TIME:-10}" +# Snapshot settings +export CASSANDRA_AUTO_SNAPSHOT_TTL="${CASSANDRA_AUTO_SNAPSHOT_TTL:-30d}" + # Authentication, Authorization and Credentials export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" export CASSANDRA_AUTHORIZER="${CASSANDRA_AUTHORIZER:-CassandraAuthorizer}" diff --git a/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh index c01e36b2f81a..4f4e5a9274dc 100644 --- a/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh +++ b/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh @@ -233,6 +233,10 @@ cassandra_validate() { check_resolved_hostname "$seed" done + if [[ ! ${CASSANDRA_AUTO_SNAPSHOT_TTL} =~ ([1-9]{1}[0-9]{0,}[d|h|m]) ]]; then + print_validation_error "CASSANDRA_AUTO_SNAPSHOT_TTL accepted units: d (days), h (hours) or m (minutes)" + fi + check_true_false_value CASSANDRA_SSL_VALIDATE check_true_false_value CASSANDRA_AUTOMATIC_SSTABLE_UPGRADE @@ -401,6 +405,7 @@ cassandra_setup_cluster() { cassandra_yaml_set "keystore_password" "$CASSANDRA_KEYSTORE_PASSWORD" cassandra_yaml_set "truststore" "$CASSANDRA_TRUSTSTORE_LOCATION" cassandra_yaml_set "truststore_password" "$CASSANDRA_TRUSTSTORE_PASSWORD" + cassandra_yaml_set "auto_snapshot_ttl" "$CASSANDRA_AUTO_SNAPSHOT_TTL" if [[ -n "$CASSANDRA_BROADCAST_ADDRESS" ]]; then cassandra_yaml_set "broadcast_address" "$CASSANDRA_BROADCAST_ADDRESS" diff --git a/bitnami/cassandra/4.0/debian-11/tags-info.yaml b/bitnami/cassandra/4.0/debian-11/tags-info.yaml index 83dd4fc9ea6a..af8648cd9d30 100644 --- a/bitnami/cassandra/4.0/debian-11/tags-info.yaml +++ b/bitnami/cassandra/4.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - - "4.0" - - "4.0-debian-11" - - "4.0.7" +- "4.0" +- 4.0-debian-11 +- 4.0.7