From 4f4097c773f79e8635653f4d2bf9880bda5ef65d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 24 Feb 2023 07:46:39 +0100
Subject: [PATCH] [bitnami/solr] Release 9.1.1-debian-11-r8 (#25240)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/solr/9/debian-11/Dockerfile           |  4 +--
 .../opt/bitnami/scripts/libservice.sh         | 33 +++++++++----------
 bitnami/solr/README.md                        |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/bitnami/solr/9/debian-11/Dockerfile b/bitnami/solr/9/debian-11/Dockerfile
index 32cd4a16e98c..d5d863d4603b 100644
--- a/bitnami/solr/9/debian-11/Dockerfile
+++ b/bitnami/solr/9/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-21T11:02:48Z" \
+      org.opencontainers.image.created="2023-02-23T22:02:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.1.1-debian-11-r7" \
+      org.opencontainers.image.ref.name="9.1.1-debian-11-r8" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.1.1"
diff --git a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index f964ab09fcba..af64e198ad2d 100644
--- a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/solr/9/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" <<EOF
-ExecStop=${exec_stop}
-EOF
+        cat >> "$service_file" <<< "ExecStop=${exec_stop}"
     fi
     if [[ -n "$exec_reload" ]]; then
-        cat >> "$service_file" <<EOF
-ExecReload=${exec_reload}
-EOF
+        cat >> "$service_file" <<< "ExecReload=${exec_reload}"
     fi
     # User and group
     if [[ -n "$user" ]]; then
-        cat >> "$service_file" <<EOF
-User=${user}
-EOF
+        cat >> "$service_file" <<< "User=${user}"
     fi
     if [[ -n "$group" ]]; then
-        cat >> "$service_file" <<EOF
-Group=${group}
-EOF
+        cat >> "$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" <<EOF
-PIDFile=${pid_file}
-EOF
+        cat >> "$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" <<EOF
 Restart=${restart}
 # Optimizations
@@ -400,8 +401,6 @@ IgnoreSIGPIPE=no
 KillMode=mixed
 # Limits
 LimitNOFILE=infinity
-# Configure output to appear in instance console output
-StandardOutput=journal+console
 
 [Install]
 # Enabling/disabling the main bitnami service should cause the same effect for this service
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index 5e7d76d1d074..42222814ba3a 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -287,7 +287,7 @@ docker-compose rm -v solr
 
 #### Step 4: Run the new image
 
-Re-create your container from the new image, restoring your backup](#restoring-a-backup if necessary.
+Re-create your container from the new image, restoring your backup if necessary.
 
 ```console
 docker run --name solr bitnami/solr:latest