From f4ae53d7bcce3c8ecfb7cebf2585333e92d1524d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 10 Apr 2023 23:23:09 +0200 Subject: [PATCH] [bitnami/nginx] Release 1.22.1-debian-11-r58 (#29846) Signed-off-by: Bitnami Containers --- bitnami/nginx/1.22/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bitnami/nginx/1.22/debian-11/Dockerfile b/bitnami/nginx/1.22/debian-11/Dockerfile index ff122a4d6e98..d030c895294b 100644 --- a/bitnami/nginx/1.22/debian-11/Dockerfile +++ b/bitnami/nginx/1.22/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-04-07T15:53:18Z" \ + org.opencontainers.image.created="2023-04-10T20:55:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.22.1-debian-11-r57" \ + org.opencontainers.image.ref.name="1.22.1-debian-11-r58" \ org.opencontainers.image.title="nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.22.1" diff --git a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 5860791219cf..94745ebe419e 100644 --- a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/nginx/1.22/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 }