From b6a4b31d5fb9da9170733104cd5dce356388fa4d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 27 Mar 2023 22:01:42 +0200 Subject: [PATCH] [bitnami/suitecrm] Release 8.2.4-debian-11-r7 (#28383) Signed-off-by: Bitnami Containers --- bitnami/suitecrm/8/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/.bitnami_components.json | 7 ------ .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/bitnami/suitecrm/8/debian-11/Dockerfile b/bitnami/suitecrm/8/debian-11/Dockerfile index 05a3c3e843eb..91a55919b988 100644 --- a/bitnami/suitecrm/8/debian-11/Dockerfile +++ b/bitnami/suitecrm/8/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-22T04:41:41Z" \ + org.opencontainers.image.created="2023-03-27T19:19:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.2.4-debian-11-r6" \ + org.opencontainers.image.ref.name="8.2.4-debian-11-r7" \ org.opencontainers.image.title="suitecrm" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.2.4" diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e86af3106368..96535efcb6a1 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,49 +1,42 @@ { "apache": { "arch": "amd64", - "digest": "d5cad8cbc55051131d136e9cdaa6f9802b24641302c8b02d823389c32b4daf30", "distro": "debian-11", "type": "NAMI", "version": "2.4.56-1" }, "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "libphp": { "arch": "amd64", - "digest": "24c55f56e7b585fb5e97094f8e6baa8889b0af01ca7cdcc0b268d717e195fb9d", "distro": "debian-11", "type": "NAMI", "version": "8.1.17-1" }, "mysql-client": { "arch": "amd64", - "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", "distro": "debian-11", "type": "NAMI", "version": "10.6.12-2" }, "php": { "arch": "amd64", - "digest": "a2e46761af1cce1ac3ca73ab79097278efc9040c60e0564df819b7a7dfc01bc3", "distro": "debian-11", "type": "NAMI", "version": "8.1.17-3" }, "render-template": { "arch": "amd64", - "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b", "distro": "debian-11", "type": "NAMI", "version": "1.0.5-2" }, "suitecrm": { "arch": "amd64", - "digest": "f62d30e36b0b4629ed19c44087de8c1ac9a2f2f9a5c236004c0be779a5b1c502", "distro": "debian-11", "type": "NAMI", "version": "8.2.4-1" diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/suitecrm/8/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/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/suitecrm/8/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 } ########################