From 950bc7dbb5519b17600d309aea781dd8f344d2a9 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 10 Apr 2023 21:56:55 +0200
Subject: [PATCH] [bitnami/java] Release 17.0.6-10-debian-11-r26 (#29780)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/java/17/debian-11/Dockerfile          |  4 ++--
 .../opt/bitnami/scripts/libwebserver.sh       | 24 +++++++++----------
 bitnami/java/17/debian-11/tags-info.yaml      |  1 -
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/bitnami/java/17/debian-11/Dockerfile b/bitnami/java/17/debian-11/Dockerfile
index b8e14f42ddaa..7f7317ce8c56 100644
--- a/bitnami/java/17/debian-11/Dockerfile
+++ b/bitnami/java/17/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-04-07T13:47:44Z" \
+      org.opencontainers.image.created="2023-04-10T19:22:52Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="17.0.6-10-debian-11-r25" \
+      org.opencontainers.image.ref.name="17.0.6-10-debian-11-r26" \
       org.opencontainers.image.title="java" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="17.0.6-10"
diff --git a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 5860791219cf..94745ebe419e 100644
--- a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,10 +112,10 @@ is_web_server_running() {
 #########################
 web_server_start() {
     info "Starting $(web_server_type) in background"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl start "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
     fi
 }
 
@@ -130,10 +130,10 @@ web_server_start() {
 #########################
 web_server_stop() {
     info "Stopping $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl stop "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
     fi
 }
 
@@ -148,10 +148,10 @@ web_server_stop() {
 #########################
 web_server_restart() {
     info "Restarting $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl restart "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
     fi
 }
 
@@ -165,10 +165,10 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl reload "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
     fi
 }
 
diff --git a/bitnami/java/17/debian-11/tags-info.yaml b/bitnami/java/17/debian-11/tags-info.yaml
index 73867cb052e5..ad0cb2123bf0 100644
--- a/bitnami/java/17/debian-11/tags-info.yaml
+++ b/bitnami/java/17/debian-11/tags-info.yaml
@@ -2,4 +2,3 @@ rolling-tags:
 - "17"
 - 17-debian-11
 - 17.0.6-10
-- latest