From deb1353a71621fad8bc3bddf6d73fa47694431df Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 22 Feb 2023 15:40:58 +0100 Subject: [PATCH] [bitnami/redis-sentinel] Release 6.2.10-debian-11-r13 (#24900) Signed-off-by: Bitnami Containers --- .../redis-sentinel/6.2/debian-11/Dockerfile | 6 ++-- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- bitnami/redis-sentinel/README.md | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/bitnami/redis-sentinel/6.2/debian-11/Dockerfile b/bitnami/redis-sentinel/6.2/debian-11/Dockerfile index abde1f4deb93..a07ce1463b6a 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/Dockerfile +++ b/bitnami/redis-sentinel/6.2/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-02-21T09:02:07Z" \ + org.opencontainers.image.created="2023-02-22T14:27:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.10-debian-11-r12" \ + org.opencontainers.image.ref.name="6.2.10-debian-11-r13" \ org.opencontainers.image.title="redis-sentinel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.10" @@ -23,7 +23,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libssl1.1 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "redis-sentinel-6.2.10-1-linux-${OS_ARCH}-debian-11" \ + "redis-sentinel-6.2.10-2-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6416d0d658a4..f8563dc0a811 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -11,6 +11,6 @@ "digest": "4ab449bba0df7cb70414c4f50ed35b589334e4b2053db58c945697572c31331d", "distro": "debian-11", "type": "NAMI", - "version": "6.2.10-1" + "version": "6.2.10-2" } } \ No newline at end of file diff --git a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/redis-sentinel/6.2/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" <