From 218f5378c1d0c961078108981215ffed53092091 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 23 Feb 2023 17:18:04 +0100 Subject: [PATCH] [bitnami/cassandra] Release 4.1.0-debian-11-r23 (#25009) Signed-off-by: Bitnami Containers --- bitnami/cassandra/4.1/debian-11/Dockerfile | 8 ++--- .../opt/bitnami/.bitnami_components.json | 8 ++--- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/bitnami/cassandra/4.1/debian-11/Dockerfile b/bitnami/cassandra/4.1/debian-11/Dockerfile index 3160ee152ff7d..80eb2767df3f0 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-02-20T15:09:10Z" \ + org.opencontainers.image.created="2023-02-23T15:45:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.0-debian-11-r22" \ + org.opencontainers.image.ref.name="4.1.0-debian-11-r23" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.1.0" @@ -23,8 +23,8 @@ 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-4-linux-${OS_ARCH}-debian-11" \ - "java-1.8.362-1-linux-${OS_ARCH}-debian-11" \ + "python-3.9.16-5-linux-${OS_ARCH}-debian-11" \ + "java-1.8.362-2-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ "yq-4.31.1-0-linux-${OS_ARCH}-debian-11" \ "cassandra-4.1.0-2-linux-${OS_ARCH}-debian-11" \ 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 da8ffbc7f4e10..c5e976989db29 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 @@ -15,17 +15,17 @@ }, "java": { "arch": "amd64", - "digest": "5bd5372669617e425c32344e8ce1558d9402474acf2c7ed8ccd54c3fbcca7ce1", + "digest": "0cb6f9d6d7247b2978176a29d50e6a9ebe853545757decaaaff1899a22ebf12c", "distro": "debian-11", "type": "NAMI", - "version": "1.8.362-1" + "version": "1.8.362-2" }, "python": { "arch": "amd64", - "digest": "3ca3cf3d15f16edd34757f892175aed86e3d95b1919425218c831cb8a29beea0", + "digest": "0d911d1fea5061d36c750b2755d3d1d9492f489be383f73f1ceffd028d60a274", "distro": "debian-11", "type": "NAMI", - "version": "3.9.16-4" + "version": "3.9.16-5" }, "yq": { "arch": "amd64", 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 f964ab09fcbab..af64e198ad2d3 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 @@ -305,6 +305,8 @@ generate_systemd_conf() { local exec_reload="" local restart="always" local pid_file="" + local standard_output="journal" + local standard_error="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -318,6 +320,8 @@ generate_systemd_conf() { | --exec-reload \ | --restart \ | --pid-file \ + | --standard-output \ + | --standard-error \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -362,36 +366,33 @@ ExecStart=${exec_start} EOF # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecStop=${exec_stop}" fi if [[ -n "$exec_reload" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecReload=${exec_reload}" fi # User and group if [[ -n "$user" ]]; then - cat >> "$service_file" <> "$service_file" <<< "User=${user}" fi if [[ -n "$group" ]]; then - cat >> "$service_file" <> "$service_file" <<< "Group=${group}" fi # PID file allows to determine if the main process is running properly (for Restart=always) if [[ -n "$pid_file" ]]; then - cat >> "$service_file" <> "$service_file" <<< "PIDFile=${pid_file}" fi # Environment flags (may be specified multiple times in a unit) if [[ -n "$environment" ]]; then cat >> "$service_file" <<< "$environment" fi + # Logging + if [[ -n "$standard_output" ]]; then + cat >> "$service_file" <<< "StandardOutput=${standard_output}" + fi + if [[ -n "$standard_error" ]]; then + cat >> "$service_file" <<< "StandardError=${standard_error}" + fi cat >> "$service_file" <