From b8f4c51a6b7a2a50f1f9b0fd9a9fce9e140ebbc8 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 28 Mar 2023 01:26:56 +0200 Subject: [PATCH] [bitnami/wavefront-proxy] Release 11.4.0-debian-11-r70 (#28462) Signed-off-by: Bitnami Containers --- .../wavefront-proxy/11/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/.bitnami_components.json | 3 --- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/bitnami/wavefront-proxy/11/debian-11/Dockerfile b/bitnami/wavefront-proxy/11/debian-11/Dockerfile index 09f4fdfd1d2b..c685bcc74b7e 100644 --- a/bitnami/wavefront-proxy/11/debian-11/Dockerfile +++ b/bitnami/wavefront-proxy/11/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:43:07Z" \ + org.opencontainers.image.created="2023-03-27T23:06:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.4.0-debian-11-r69" \ + org.opencontainers.image.ref.name="11.4.0-debian-11-r70" \ org.opencontainers.image.title="wavefront-proxy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="11.4.0" diff --git a/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8d77c524d94e..998fd7defbc1 100644 --- a/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,21 +1,18 @@ { "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" }, "wavefront-proxy": { "arch": "amd64", - "digest": "96d870de5cf9a28845204c97287f5370b301d87e2789be6df0068879f14bc33b", "distro": "debian-11", "type": "NAMI", "version": "11.4.0-6" diff --git a/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/wavefront-proxy/11/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/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/wavefront-proxy/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/wavefront-proxy/11/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 } ########################