mirror of
https://github.com/bitnami/containers.git
synced 2026-03-16 06:49:12 +08:00
[bitnami/drupal-nginx] Release 9.5.1-debian-11-r0 (#20876)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -4,11 +4,12 @@ ARG TARGETARCH
|
||||
|
||||
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
|
||||
org.opencontainers.image.description="Application packaged by Bitnami" \
|
||||
org.opencontainers.image.ref.name="9.4.9-debian-11-r1" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="9.5.1-debian-11-r0" \
|
||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal-nginx" \
|
||||
org.opencontainers.image.title="drupal-nginx" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="9.4.9"
|
||||
org.opencontainers.image.version="9.5.1"
|
||||
|
||||
ENV HOME="/" \
|
||||
OS_ARCH="${TARGETARCH:-amd64}" \
|
||||
@@ -21,12 +22,12 @@ 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.13-2-linux-${OS_ARCH}-debian-11" \
|
||||
"nginx-1.23.2-2-linux-${OS_ARCH}-debian-11" \
|
||||
"mysql-client-10.6.11-1-linux-${OS_ARCH}-debian-11" \
|
||||
"render-template-1.0.4-1-linux-${OS_ARCH}-debian-11" \
|
||||
"gosu-1.14.0-156-linux-${OS_ARCH}-debian-11" \
|
||||
"drupal-9.4.9-1-linux-${OS_ARCH}-debian-11" \
|
||||
"php-8.1.14-1-linux-${OS_ARCH}-debian-11" \
|
||||
"nginx-1.23.3-1-linux-${OS_ARCH}-debian-11" \
|
||||
"mysql-client-10.6.11-2-linux-${OS_ARCH}-debian-11" \
|
||||
"render-template-1.0.4-2-linux-${OS_ARCH}-debian-11" \
|
||||
"gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
|
||||
"drupal-9.5.1-0-linux-${OS_ARCH}-debian-11" \
|
||||
) && \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
|
||||
@@ -47,7 +48,7 @@ RUN /opt/bitnami/scripts/php/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/drupal/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
|
||||
ENV APP_VERSION="9.4.9" \
|
||||
ENV APP_VERSION="9.5.1" \
|
||||
BITNAMI_APP_NAME="drupal-nginx" \
|
||||
NGINX_HTTPS_PORT_NUMBER="" \
|
||||
NGINX_HTTP_PORT_NUMBER="" \
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
{
|
||||
"drupal": {
|
||||
"arch": "amd64",
|
||||
"digest": "341c7c68e4ab3beb1b9b9ce6d7aebe717545aa5e3effcfa8b1816bb163da6e9b",
|
||||
"digest": "8d570727c655a0a6d98ffae59f8125e79cd2243754e4811b7a663b90c7ab01d5",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "9.4.9-1"
|
||||
"version": "9.5.1-0"
|
||||
},
|
||||
"gosu": {
|
||||
"arch": "amd64",
|
||||
"digest": "7969f4cc8ad0a260f891cccf5694686a513f4706b48771d605645be1f3f072e2",
|
||||
"digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.14.0-156"
|
||||
"version": "1.16.0-1"
|
||||
},
|
||||
"mysql-client": {
|
||||
"arch": "amd64",
|
||||
"digest": "5c67ad12863f967c435da9070c023bf5342c83f2a82d03c7e822cfbc28c342d1",
|
||||
"digest": "16021bca72e714177049564fbbd73ea142b97eaa7a889afad64eca8fa353959f",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "10.6.11-1"
|
||||
"version": "10.6.11-2"
|
||||
},
|
||||
"nginx": {
|
||||
"arch": "amd64",
|
||||
"digest": "8643036fdd3909a1f96fc8d2d09fa936c5c77cdb0ff424223f856b7a75c5e924",
|
||||
"digest": "bb184b4a6fa54bc7bf3fb5d2a861b8219c8769c7b21076fdfe9c74a641b0aa9b",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.23.2-2"
|
||||
"version": "1.23.3-1"
|
||||
},
|
||||
"php": {
|
||||
"arch": "amd64",
|
||||
"digest": "9c51da67237a0790a4d05a4c63d36512fd156da925fde2484318241593eb2d8f",
|
||||
"digest": "4dfcd710baee20f9690f910709c5fca5e2bf63d0cf275cf0a2ada72733b50374",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "8.1.13-2"
|
||||
"version": "8.1.14-1"
|
||||
},
|
||||
"render-template": {
|
||||
"arch": "amd64",
|
||||
"digest": "045804695ee2c857d91f28ba623f8c5f6898f5ae9016ee78504d3af76411c261",
|
||||
"digest": "64bd7fafa98c548438f7c304bdac850a7f048bd8c2135af613b8748a370f1ef0",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.4-1"
|
||||
"version": "1.0.4-2"
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ get_sematic_version () {
|
||||
|
||||
while [[ $i -lt $n ]]; do
|
||||
if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]]; then
|
||||
version_sections[$j]=${BASH_REMATCH[$i]}
|
||||
version_sections[j]="${BASH_REMATCH[$i]}"
|
||||
((j++))
|
||||
fi
|
||||
((i++))
|
||||
|
||||
@@ -368,23 +368,9 @@ drush_config_set() {
|
||||
local -r key="${2:?missing config key}"
|
||||
local -r value="${3:-}"
|
||||
|
||||
local -r major_version="$(get_sematic_version "$(drupal_get_version)" 1)"
|
||||
drush_execute "config-set" "--yes" "$group" "$key" "$value"
|
||||
}
|
||||
|
||||
########################
|
||||
# Get Drupal version
|
||||
# Globals:
|
||||
# *
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# Version string
|
||||
#########################
|
||||
drupal_get_version() {
|
||||
BITNAMI_DEBUG=true drush_execute "status" "drupal-version" "--pipe" | grep -E -o '[0-9.]+'
|
||||
}
|
||||
|
||||
########################
|
||||
# Drupal enable modules
|
||||
# Globals:
|
||||
@@ -411,8 +397,6 @@ drupal_enable_modules() {
|
||||
# None
|
||||
#########################
|
||||
drupal_configure_smtp() {
|
||||
local -r major_version="$(get_sematic_version "$(drupal_get_version)" 1)"
|
||||
|
||||
drush_execute "pm:enable" "--yes" "smtp"
|
||||
|
||||
drush_config_set "system.mail" "interface.default" "SMTPMailSystem"
|
||||
@@ -436,7 +420,6 @@ drupal_configure_smtp() {
|
||||
# None
|
||||
#########################
|
||||
drupal_flush_cache() {
|
||||
local -r major_version="$(get_sematic_version "$(drupal_get_version)" 1)"
|
||||
drush_execute "cache:rebuild"
|
||||
}
|
||||
|
||||
|
||||
@@ -419,7 +419,7 @@ mysql_stop() {
|
||||
for f in "${db_files[@]}"; do
|
||||
debug_execute fuser "$f" && return_value=1
|
||||
done
|
||||
return $return_value
|
||||
return "$return_value"
|
||||
}
|
||||
|
||||
! is_mysql_running && return
|
||||
|
||||
@@ -252,14 +252,14 @@ ensure_nginx_app_configuration_exists() {
|
||||
--server-aliases)
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
shift
|
||||
read -r -a "$var_name" <<<"$1"
|
||||
read -r -a "${var_name?}" <<<"$1"
|
||||
;;
|
||||
--disable | \
|
||||
--disable-http | \
|
||||
--disable-https)
|
||||
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
export "${var_name}=yes"
|
||||
export "${var_name?}=yes"
|
||||
;;
|
||||
--type | \
|
||||
--server-name | \
|
||||
@@ -273,7 +273,7 @@ ensure_nginx_app_configuration_exists() {
|
||||
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
shift
|
||||
export "${var_name}"="$1"
|
||||
export "${var_name?}"="$1"
|
||||
;;
|
||||
*)
|
||||
echo "Invalid command line flag $1" >&2
|
||||
@@ -419,7 +419,7 @@ ensure_nginx_prefix_configuration_exists() {
|
||||
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
shift
|
||||
declare "${var_name}"="$1"
|
||||
declare "${var_name?}"="$1"
|
||||
;;
|
||||
*)
|
||||
echo "Invalid command line flag $1" >&2
|
||||
@@ -499,7 +499,7 @@ nginx_update_app_configuration() {
|
||||
)
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
shift
|
||||
read -r -a "$var_name" <<<"$1"
|
||||
read -r -a "${var_name?}" <<<"$1"
|
||||
;;
|
||||
# Common flags
|
||||
--enable-http \
|
||||
@@ -508,7 +508,7 @@ nginx_update_app_configuration() {
|
||||
| --disable-https \
|
||||
)
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
declare "${var_name}=yes"
|
||||
declare "${var_name?}=yes"
|
||||
;;
|
||||
--server-name \
|
||||
| --http-port \
|
||||
@@ -516,7 +516,7 @@ nginx_update_app_configuration() {
|
||||
)
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
shift
|
||||
declare "${var_name}=${1}"
|
||||
declare "${var_name?}=${1}"
|
||||
;;
|
||||
|
||||
*)
|
||||
|
||||
@@ -26,6 +26,9 @@ php_conf_set "listen" "$PHP_FPM_DEFAULT_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm
|
||||
php_conf_set "upload_tmp_dir" "${PHP_BASE_DIR}/tmp"
|
||||
php_conf_set "session.save_path" "${PHP_TMP_DIR}/session"
|
||||
|
||||
# Log errors to stdout for easy debugging
|
||||
php_conf_set "error_log" "/dev/stderr"
|
||||
|
||||
# Ensure directories used by PHP-FPM exist and have proper ownership and permissions
|
||||
for dir in "$PHP_CONF_DIR" "${PHP_BASE_DIR}/tmp" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR" "${PHP_TMP_DIR}/session"; do
|
||||
ensure_dir_exists "$dir"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
rolling-tags:
|
||||
- "9"
|
||||
- "9-debian-11"
|
||||
- "9.4.9"
|
||||
- "9.5.1"
|
||||
- "latest"
|
||||
|
||||
Reference in New Issue
Block a user