From 76d5f6f378dc7a5854176eb29af6abc4db4ba291 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 27 Mar 2023 23:43:37 +0200
Subject: [PATCH] [bitnami/tomcat] Release 9.0.73-debian-11-r3 (#28401)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/tomcat/9.0/debian-11/Dockerfile       |  4 ++--
 .../opt/bitnami/.bitnami_components.json      |  4 ----
 .../opt/bitnami/scripts/libservice.sh         |  2 +-
 .../opt/bitnami/scripts/libwebserver.sh       | 24 +++++++++++++++----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/bitnami/tomcat/9.0/debian-11/Dockerfile b/bitnami/tomcat/9.0/debian-11/Dockerfile
index 6ee2cc94fbbe..f6bc75f44584 100644
--- a/bitnami/tomcat/9.0/debian-11/Dockerfile
+++ b/bitnami/tomcat/9.0/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-22T04:42:20Z" \
+      org.opencontainers.image.created="2023-03-27T21:20:57Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.0.73-debian-11-r2" \
+      org.opencontainers.image.ref.name="9.0.73-debian-11-r3" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.0.73"
diff --git a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 05eed2165a5d..bfc044103d45 100644
--- a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,28 +1,24 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.16.0-3"
     },
     "java": {
         "arch": "amd64",
-        "digest": "fbdf266273a4dd4c5fc37c344462aa50047549aa2e63858ffee5594ea450fca5",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "11.0.18-10-3"
     },
     "render-template": {
         "arch": "amd64",
-        "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.0.5-2"
     },
     "tomcat": {
         "arch": "amd64",
-        "digest": "fa0c590c144b438a5361a349047891d81915c4a9bbc2a9ba64b91d3df80d9316",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "9.0.73-1"
diff --git a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 2d4b7af6fd3a..6fcb304d34cc 100644
--- a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -395,7 +395,7 @@ PartOf=bitnami.service
 Type=${type}
 EOF
     if [[ -n "$working_directory" ]]; then
-        cat >> "$service_file" <<< "WorkingDirectory=$working_directory"
+        cat >> "$service_file" <<< "WorkingDirectory=${working_directory}"
     fi
     if [[ -n "$exec_start_pre" ]]; then
         # This variable may contain multiple ExecStartPre= directives
diff --git a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/tomcat/9.0/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
 }
 
 ########################