From a087cefe2338b6b4addb4af0b92f80a45fcec31f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 24 Mar 2023 21:57:30 +0100 Subject: [PATCH] [bitnami/drupal] Release 9.5.7-debian-11-r0 (#28211) Signed-off-by: Bitnami Containers --- bitnami/drupal/9/debian-11/Dockerfile | 10 ++++---- .../opt/bitnami/.bitnami_components.json | 4 ++-- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- bitnami/drupal/9/debian-11/tags-info.yaml | 2 +- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/bitnami/drupal/9/debian-11/Dockerfile b/bitnami/drupal/9/debian-11/Dockerfile index ba0422b0f8c2..4017a17266ec 100644 --- a/bitnami/drupal/9/debian-11/Dockerfile +++ b/bitnami/drupal/9/debian-11/Dockerfile @@ -3,13 +3,13 @@ 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-21T22:20:58Z" \ + org.opencontainers.image.created="2023-03-24T20:08:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.5-debian-11-r1" \ + org.opencontainers.image.ref.name="9.5.7-debian-11-r0" \ org.opencontainers.image.title="drupal" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="9.5.5" + org.opencontainers.image.version="9.5.7" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "libphp-8.1.17-1-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ - "drupal-9.5.5-1-linux-${OS_ARCH}-debian-11" \ + "drupal-9.5.7-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="9.5.5" \ + APP_VERSION="9.5.7" \ BITNAMI_APP_NAME="drupal" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH" diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8fd88a66017b..72d25afaf14e 100644 --- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "drupal": { "arch": "amd64", - "digest": "c41ce13aa284eab744583d99194df1e131e3776b62128d9696ec3fb65dd9da8c", + "digest": "624c71da159ffd9aa7184d633bcff8d3d6a8eadf0055c4144231a1a76fa77e40", "distro": "debian-11", "type": "NAMI", - "version": "9.5.5-1" + "version": "9.5.7-0" }, "gosu": { "arch": "amd64", diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/drupal/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/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/drupal/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 } ######################## diff --git a/bitnami/drupal/9/debian-11/tags-info.yaml b/bitnami/drupal/9/debian-11/tags-info.yaml index 7a819ee609d0..a5c63740e9e2 100644 --- a/bitnami/drupal/9/debian-11/tags-info.yaml +++ b/bitnami/drupal/9/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "9" - 9-debian-11 -- 9.5.5 +- 9.5.7