From 0744043ff7dbe08bb4d423f989a47ac48ea8a944 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 11 Apr 2023 20:30:46 +0200 Subject: [PATCH] [bitnami/cassandra] Release 4.0.8-debian-11-r14 (#29996) Signed-off-by: Bitnami Containers --- bitnami/cassandra/4.0/debian-11/Dockerfile | 6 ++--- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bitnami/cassandra/4.0/debian-11/Dockerfile b/bitnami/cassandra/4.0/debian-11/Dockerfile index 3ebe9a7741be..119190d698d8 100644 --- a/bitnami/cassandra/4.0/debian-11/Dockerfile +++ b/bitnami/cassandra/4.0/debian-11/Dockerfile @@ -4,10 +4,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-04-08T16:54:52Z" \ + org.opencontainers.image.created="2023-04-11T17:51:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.8-debian-11-r13" \ + org.opencontainers.image.ref.name="4.0.8-debian-11-r14" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.0.8" @@ -26,7 +26,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "python-3.9.16-9-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.0.8-4-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ 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 35e3603548dc..966b31c02f9c 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 @@ -27,6 +27,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.33.2-0" + "version": "4.33.3-0" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 5860791219cf..94745ebe419e 100644 --- a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/cassandra/4.0/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 }