From 939eff0cd07afcd49eeb3196ffb2b12cd28dd416 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 21 Feb 2023 20:30:30 +0100 Subject: [PATCH] [bitnami/keycloak] Release 20.0.5-debian-11-r0 (#24847) Signed-off-by: Bitnami Containers --- bitnami/keycloak/20/debian-11/Dockerfile | 10 +++--- .../opt/bitnami/.bitnami_components.json | 4 +-- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- bitnami/keycloak/20/debian-11/tags-info.yaml | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/bitnami/keycloak/20/debian-11/Dockerfile b/bitnami/keycloak/20/debian-11/Dockerfile index a30f09e9d6bc..693b17d3c090 100644 --- a/bitnami/keycloak/20/debian-11/Dockerfile +++ b/bitnami/keycloak/20/debian-11/Dockerfile @@ -4,13 +4,13 @@ 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-21T08:08:02Z" \ + org.opencontainers.image.created="2023-02-21T18:50:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="20.0.3-debian-11-r16" \ + org.opencontainers.image.ref.name="20.0.5-debian-11-r0" \ org.opencontainers.image.title="keycloak" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="20.0.3" + org.opencontainers.image.version="20.0.5" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -25,7 +25,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ "java-11.0.18-10-2-linux-${OS_ARCH}-debian-11" \ - "keycloak-20.0.3-7-linux-${OS_ARCH}-debian-11" \ + "keycloak-20.0.5-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/keycloak/postunpack.sh -ENV APP_VERSION="20.0.3" \ +ENV APP_VERSION="20.0.5" \ BITNAMI_APP_NAME="keycloak" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/keycloak/bin:$PATH" diff --git a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9381c34dd7f0..36a1b9eda8ca 100644 --- a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,10 +15,10 @@ }, "keycloak": { "arch": "amd64", - "digest": "4d2a5a8f0234b4cb8b47faec83795142ab244616863dbbfe0d3a516a2e470ca9", + "digest": "9765132689326b641d7fafffb307ea7c584f422cff9dd874e5f8599f54c7d6b2", "distro": "debian-11", "type": "NAMI", - "version": "20.0.3-7" + "version": "20.0.5-0" }, "wait-for-port": { "arch": "amd64", diff --git a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/keycloak/20/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" <