From fe1c80fe200141a18686b16fc60e5f2d0bdb209d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 28 Mar 2023 11:59:19 +0200 Subject: [PATCH] [bitnami/discourse] Release 3.0.2-debian-11-r2 (#28605) Signed-off-by: Bitnami Containers --- bitnami/discourse/3/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/.bitnami_components.json | 8 ------- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile index b2bc26294b76..32e62435516b 100644 --- a/bitnami/discourse/3/debian-11/Dockerfile +++ b/bitnami/discourse/3/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-03-21T23:41:11Z" \ + org.opencontainers.image.created="2023-03-28T06:56:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.0.2-debian-11-r1" \ + org.opencontainers.image.ref.name="3.0.2-debian-11-r2" \ org.opencontainers.image.title="discourse" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.0.2" diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2d9db0e9e827..c43889b82fbe 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,56 +1,48 @@ { "brotli": { "arch": "amd64", - "digest": "b2d9fa688aecb04a040c7eb202b399ff9ffbea143a203e60f0a993c53d4fcff7", "distro": "debian-11", "type": "NAMI", "version": "1.0.9-158" }, "discourse": { "arch": "amd64", - "digest": "b0698b605b8c70b94fbc0b00297a828ee6df2063185efcd1879329761d61a32c", "distro": "debian-11", "type": "NAMI", "version": "3.0.2-0" }, "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "node": { "arch": "amd64", - "digest": "6a3b2d1e7ab2f53f2f70faa3bab6406727c5024f73581294724b97eeb4ee4a2b", "distro": "debian-11", "type": "NAMI", "version": "18.15.0-1" }, "postgresql-client": { "arch": "amd64", - "digest": "f30b5782e06f5a81190143d77d76c364a73836ffa635b349478dcc1bee6b06ed", "distro": "debian-11", "type": "NAMI", "version": "15.2.0-2" }, "python": { "arch": "amd64", - "digest": "faf2f2e22f3ae88f12fb973d60295f7d63fab48c6909ae351e88ee31c5d296c6", "distro": "debian-11", "type": "NAMI", "version": "3.8.16-8" }, "ruby": { "arch": "amd64", - "digest": "d7e6302888e576514059077f449a85432386655d4cd3bb909915c4388b1bc054", "distro": "debian-11", "type": "NAMI", "version": "3.1.3-5" }, "wait-for-port": { "arch": "amd64", - "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc", "distro": "debian-11", "type": "NAMI", "version": "1.0.6-2" diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/discourse/3/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/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/discourse/3/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 } ########################