diff --git a/bitnami/cassandra/4.1/debian-11/Dockerfile b/bitnami/cassandra/4.1/debian-11/Dockerfile index 036b54bb4e85..14c7829c66ba 100644 --- a/bitnami/cassandra/4.1/debian-11/Dockerfile +++ b/bitnami/cassandra/4.1/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-03-22T15:51:43Z" \ + org.opencontainers.image.created="2023-03-28T09:20:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.1-debian-11-r0" \ + org.opencontainers.image.ref.name="4.1.1-debian-11-r1" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.1.1" @@ -26,7 +26,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "python-3.9.16-8-linux-${OS_ARCH}-debian-11" \ "java-1.8.362-3-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ - "yq-4.32.2-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.33.1-0-linux-${OS_ARCH}-debian-11" \ "cassandra-4.1.1-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ 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 41d421209909..26c101d8c60e 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 @@ -1,37 +1,32 @@ { "cassandra": { "arch": "amd64", - "digest": "8815db6cd69ca2074b711d5b80546cd3f2a1a32a30f9a59ddb69da4ee25ca934", "distro": "debian-11", "type": "NAMI", "version": "4.1.1-0" }, "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "java": { "arch": "amd64", - "digest": "a01727685913db816e1db77cf4b3e5eeaec8bbba762a9c6d708d0749b2c6a75b", "distro": "debian-11", "type": "NAMI", "version": "1.8.362-3" }, "python": { "arch": "amd64", - "digest": "7356ba4f9823199ca5819c7f814ed7d971c3fe916726bb53d8b929414c5b3e2b", "distro": "debian-11", "type": "NAMI", "version": "3.9.16-8" }, "yq": { "arch": "amd64", - "digest": "e09f11557e4dfd4170495f320d5ce5655c57ac9be844f81f27066cce84c1bad8", "distro": "debian-11", "type": "NAMI", - "version": "4.32.2-0" + "version": "4.33.1-0" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + fi } ########################