From 4cb7d2a959131d3af52e709284be02b083eb741f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Jul 2023 22:12:18 +0200 Subject: [PATCH] [bitnami/cassandra] Release 4.1.2-debian-11-r11 (#39562) Signed-off-by: Bitnami Containers --- bitnami/cassandra/4.1/debian-11/Dockerfile | 6 ++--- .../4.1/debian-11/docker-compose.yml | 3 +++ .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libbitnami.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libfile.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libfs.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libhook.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/liblog.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libnet.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 ++ .../opt/bitnami/scripts/libpersistence.sh | 2 ++ .../opt/bitnami/scripts/libservice.sh | 24 +++++++++++++++---- .../opt/bitnami/scripts/libvalidations.sh | 2 ++ .../opt/bitnami/scripts/libversion.sh | 2 ++ .../opt/bitnami/scripts/libwebserver.sh | 2 ++ .../prebuildfs/usr/sbin/install_packages | 2 ++ .../opt/bitnami/scripts/cassandra-env.sh | 2 ++ .../bitnami/scripts/cassandra/entrypoint.sh | 2 ++ .../bitnami/scripts/cassandra/postunpack.sh | 2 ++ .../opt/bitnami/scripts/cassandra/setup.sh | 2 ++ .../opt/bitnami/scripts/java/entrypoint.sh | 2 ++ .../opt/bitnami/scripts/java/postunpack.sh | 2 ++ .../opt/bitnami/scripts/libcassandra.sh | 2 ++ bitnami/cassandra/docker-compose-cluster.yml | 3 +++ bitnami/cassandra/docker-compose.yml | 3 +++ 25 files changed, 70 insertions(+), 9 deletions(-) diff --git a/bitnami/cassandra/4.1/debian-11/Dockerfile b/bitnami/cassandra/4.1/debian-11/Dockerfile index d6ec90c12990..e047db0d70bc 100644 --- a/bitnami/cassandra/4.1/debian-11/Dockerfile +++ b/bitnami/cassandra/4.1/debian-11/Dockerfile @@ -7,10 +7,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-06-25T18:42:50Z" \ + org.opencontainers.image.created="2023-07-01T19:42:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.2-debian-11-r9" \ + org.opencontainers.image.ref.name="4.1.2-debian-11-r11" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.1.2" @@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "python-3.9.17-1-linux-${OS_ARCH}-debian-11" \ "java-1.8.372-7-1-linux-${OS_ARCH}-debian-11" \ - "yq-4.34.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.34.1-6-linux-${OS_ARCH}-debian-11" \ "cassandra-4.1.2-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/cassandra/4.1/debian-11/docker-compose.yml b/bitnami/cassandra/4.1/debian-11/docker-compose.yml index 0dda8d4e556b..af3d31b2f806 100644 --- a/bitnami/cassandra/4.1/debian-11/docker-compose.yml +++ b/bitnami/cassandra/4.1/debian-11/docker-compose.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + version: '2' services: diff --git 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 index 6fe68e920b62..8dd22f3ffeae 100644 --- 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 @@ -21,6 +21,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.34.1-0" + "version": "4.34.1-6" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 4242023f9415..184de8a117e2 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh index 41ebaf7464f6..63759c777f3b 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh index eb52f7644785..96b22f99710c 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh index 9694852a7d25..dadd06149e00 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh index c7c0f6d4422a..2a9e76a4d725 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh index 8bbf165e3e2a..b47c69a56825 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for network functions diff --git 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 index 6d9ca8546eef..c0500acee78d 100644 --- 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 @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 99df69681c27..af6af64d6dd0 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index d70cf0779ec8..107f54e6b5c9 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -104,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -131,7 +131,12 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then - echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" + cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" fi @@ -187,7 +192,10 @@ generate_monit_conf() { is_boolean_yes "$disabled" && conf_suffix=".disabled" mkdir -p "$monit_conf_dir" - cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <"${logrotate_conf_dir}/${service_name}" + cat < "${logrotate_conf_dir}/${service_name}" +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ${log_path} { ${period} rotate ${rotations} @@ -391,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <