From 296c20884a5c9a5010c4780cb78f7c23f226e7b0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 28 Mar 2023 09:59:37 +0200 Subject: [PATCH] [bitnami/laravel] Release 9.5.2-debian-11-r16 (#28599) Signed-off-by: Bitnami Containers --- bitnami/laravel/9/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/.bitnami_components.json | 6 ----- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/bitnami/laravel/9/debian-11/Dockerfile b/bitnami/laravel/9/debian-11/Dockerfile index 4c5be662eb44..fca5d9e72220 100644 --- a/bitnami/laravel/9/debian-11/Dockerfile +++ b/bitnami/laravel/9/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-22T02:47:10Z" \ + org.opencontainers.image.created="2023-03-28T07:27:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.2-debian-11-r15" \ + org.opencontainers.image.ref.name="9.5.2-debian-11-r16" \ org.opencontainers.image.title="laravel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="9.5.2" diff --git a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 52367d2f0780..df7e29a878a8 100644 --- a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,42 +1,36 @@ { "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "laravel": { "arch": "amd64", - "digest": "6a361bcd8cbc5906301c742009f5309ab8171d290a54582acd2db0694143916a", "distro": "debian-11", "type": "NAMI", "version": "9.5.2-3" }, "node": { "arch": "amd64", - "digest": "6a3b2d1e7ab2f53f2f70faa3bab6406727c5024f73581294724b97eeb4ee4a2b", "distro": "debian-11", "type": "NAMI", "version": "18.15.0-1" }, "php": { "arch": "amd64", - "digest": "a2e46761af1cce1ac3ca73ab79097278efc9040c60e0564df819b7a7dfc01bc3", "distro": "debian-11", "type": "NAMI", "version": "8.1.17-3" }, "python": { "arch": "amd64", - "digest": "faf2f2e22f3ae88f12fb973d60295f7d63fab48c6909ae351e88ee31c5d296c6", "distro": "debian-11", "type": "NAMI", "version": "3.8.16-8" }, "wait-for-port": { "arch": "amd64", - "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc", "distro": "debian-11", "type": "NAMI", "version": "1.0.6-2" diff --git a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/laravel/9/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/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/laravel/9/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 } ########################