From ba3363616fc2e58b8305596841c203dfe376cae3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 24 Mar 2023 12:11:31 +0100 Subject: [PATCH] [bitnami/drupal-nginx] Release 10.0.5-debian-11-r2 (#28188) Signed-off-by: Bitnami Containers --- bitnami/drupal-nginx/10/debian-11/Dockerfile | 6 ++--- .../opt/bitnami/.bitnami_components.json | 4 ++-- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/bitnami/drupal-nginx/10/debian-11/Dockerfile b/bitnami/drupal-nginx/10/debian-11/Dockerfile index 7d379aa6804f..0958eeb92121 100644 --- a/bitnami/drupal-nginx/10/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/10/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-21T09:37:43Z" \ + org.opencontainers.image.created="2023-03-24T10:25:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.0.5-debian-11-r1" \ + org.opencontainers.image.ref.name="10.0.5-debian-11-r2" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.0.5" @@ -22,7 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps unzip zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.1.17-1-linux-${OS_ARCH}-debian-11" \ + "php-8.1.17-3-linux-${OS_ARCH}-debian-11" \ "nginx-1.23.3-4-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 41801da39016..6812d07856fb 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "29a2bd14bc69f30f96706c9d26c42e4613c50a663ddcd1c10b20766ca261127b", + "digest": "a2e46761af1cce1ac3ca73ab79097278efc9040c60e0564df819b7a7dfc01bc3", "distro": "debian-11", "type": "NAMI", - "version": "8.1.17-1" + "version": "8.1.17-3" }, "render-template": { "arch": "amd64", diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/drupal-nginx/10/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-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/drupal-nginx/10/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 } ########################