From 5a455316e1d2dd1f90a180c9eef65b394c74246a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 12 Jul 2022 01:43:15 +0000 Subject: [PATCH] 5.9.3-debian-11-r16 release --- bitnami/wordpress/5/debian-11/Dockerfile | 4 +-- .../opt/bitnami/.bitnami_components.json | 8 ++--- .../opt/bitnami/scripts/libwordpress.sh | 29 +++++++++++++++++++ .../opt/bitnami/scripts/wordpress-env.sh | 2 ++ bitnami/wordpress/README.md | 2 +- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/bitnami/wordpress/5/debian-11/Dockerfile b/bitnami/wordpress/5/debian-11/Dockerfile index 3da0414583c3..7c25451e219f 100644 --- a/bitnami/wordpress/5/debian-11/Dockerfile +++ b/bitnami/wordpress/5/debian-11/Dockerfile @@ -10,11 +10,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl gzip less libaudit1 libbrotli1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 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 libpcre2-8-0 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 tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.3-150" --checksum 8b992a5ee513c5eaca52b19232b21a93588ddf4c4850be4d47c6f19b11d1d90a RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.21-1" --checksum 8de753b93e302f5f2e2dcae661a9af2c38762b9ff23200ecd78228e2636aba3c -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.54-150" --checksum d6ead7637955f94ec4821b1d2ceccb36fb91b8f4ee4aef3bf4287c588be2f1b4 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.54-151" --checksum 988f12cbb80baba2b275ec922bb714852593f5c40940658a8b2717651200d92e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wp-cli" "2.6.0-151" --checksum b426a51a33d93a22917e843161af356f733e806293bab5b93ddacf9b4041a5b7 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.8-150" --checksum b47e1015fc1c9ce456f134ffd5b6ac6960c3f369c96fcd37319e9289b29a1047 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.21-0" --checksum 694fb598b67e1592b31fd1fc9ab0e9be5030ed9036b4689964e1c0e304b657bb -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "5.9.3-158" --checksum a2deff975909b8e9f17529a208bc85e2e3c503a5750b4e027daba2504547c9cb +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "5.9.3-159" --checksum fec5bc3c0a20dfe365ccec777f5c7fc109e656cd7e198c51340bda320a1584ae RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-151" --checksum 089bb11a3bc6031c5a91ab5f9534e9e7e41b928d10d72a3986f16bb61d3a9900 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/wordpress/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 50094b5191cb..2af730abea2d 100644 --- a/bitnami/wordpress/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "apache": { "arch": "amd64", - "digest": "d6ead7637955f94ec4821b1d2ceccb36fb91b8f4ee4aef3bf4287c588be2f1b4", + "digest": "988f12cbb80baba2b275ec922bb714852593f5c40940658a8b2717651200d92e", "distro": "debian-11", "type": "NAMI", - "version": "2.4.54-150" + "version": "2.4.54-151" }, "gosu": { "arch": "amd64", @@ -43,10 +43,10 @@ }, "wordpress": { "arch": "amd64", - "digest": "a2deff975909b8e9f17529a208bc85e2e3c503a5750b4e027daba2504547c9cb", + "digest": "fec5bc3c0a20dfe365ccec777f5c7fc109e656cd7e198c51340bda320a1584ae", "distro": "debian-11", "type": "NAMI", - "version": "5.9.3-158" + "version": "5.9.3-159" }, "wp-cli": { "arch": "amd64", diff --git a/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh b/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh index 30e65d56d14c..39805898235a 100644 --- a/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh +++ b/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh @@ -89,6 +89,7 @@ wordpress_validate() { check_yes_no_value "WORDPRESS_RESET_DATA_PERMISSIONS" check_yes_no_value "WORDPRESS_SKIP_BOOTSTRAP" check_multi_value "WORDPRESS_AUTO_UPDATE_LEVEL" "major minor none" + check_yes_no_value "WORDPRESS_ENABLE_REVERSE_PROXY" # Multisite validations check_yes_no_value "WORDPRESS_ENABLE_MULTISITE" @@ -243,6 +244,7 @@ wordpress_initialize() { if is_file_writable "$WORDPRESS_CONF_FILE"; then # Set miscellaneous configurations wordpress_conf_set "FS_METHOD" "direct" + is_boolean_yes "$WORDPRESS_ENABLE_REVERSE_PROXY" && wordpress_configure_reverse_proxy ! is_boolean_yes "$WORDPRESS_ENABLE_MULTISITE" && wordpress_configure_urls # The only variable/non-constant in the entire configuration file is '$table_prefix' replace_in_file "$WORDPRESS_CONF_FILE" "^(\s*\\\$table_prefix\s*=\s*).*" "\1'$WORDPRESS_TABLE_PREFIX';" @@ -606,6 +608,33 @@ if ( !defined( 'WP_CLI' ) ) { EOF } +######################## +# Configure reverse proxy headers +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +wordpress_configure_reverse_proxy() { + wordpress_conf_append "$( + cat <<"EOF" +/** + * Handle potential reverse proxy headers. Ref: + * - https://wordpress.org/support/article/faq-installation/#how-can-i-get-wordpress-working-when-im-behind-a-reverse-proxy + * - https://wordpress.org/support/article/administration-over-ssl/#using-a-reverse-proxy + */ +if ( ! empty( $_SERVER['HTTP_X_FORWARDED_HOST'] ) ) { + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_FORWARDED_HOST']; +} +if ( ! empty( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) \&\& 'https' === $_SERVER['HTTP_X_FORWARDED_PROTO'] ) { + $_SERVER['HTTPS'] = 'on'; +} +EOF + )" +} + ######################## # Configure application URLs for WordPress (non-Multisite) # Globals: diff --git a/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh index bcb3c9575b3e..f3d133d0ce1c 100644 --- a/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh +++ b/bitnami/wordpress/5/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh @@ -44,6 +44,7 @@ wordpress_env_vars=( WORDPRESS_SECURE_AUTH_SALT WORDPRESS_LOGGED_IN_SALT WORDPRESS_NONCE_SALT + WORDPRESS_ENABLE_REVERSE_PROXY WORDPRESS_USERNAME WORDPRESS_PASSWORD WORDPRESS_EMAIL @@ -135,6 +136,7 @@ export WORDPRESS_AUTH_SALT="${WORDPRESS_AUTH_SALT:-}" export WORDPRESS_SECURE_AUTH_SALT="${WORDPRESS_SECURE_AUTH_SALT:-}" export WORDPRESS_LOGGED_IN_SALT="${WORDPRESS_LOGGED_IN_SALT:-}" export WORDPRESS_NONCE_SALT="${WORDPRESS_NONCE_SALT:-}" +export WORDPRESS_ENABLE_REVERSE_PROXY="${WORDPRESS_ENABLE_REVERSE_PROXY:-no}" # only used during the first initialization # WordPress credentials export WORDPRESS_USERNAME="${WORDPRESS_USERNAME:-user}" # only used during the first initialization diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md index 99d9b12c7b0f..31900731daa5 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`6`, `6-debian-11`, `6.0.0`, `6.0.0-debian-11-r12`, `latest` (6/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/6.0.0-debian-11-r12/6/debian-11/Dockerfile) - [`6`, `6-debian-10`, `6.0.0`, `6.0.0-debian-10-r-1`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/6.0.0-debian-10-r-1/6/debian-10/Dockerfile) -- [`5`, `5-debian-11`, `5.9.3`, `5.9.3-debian-11-r15` (5/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.9.3-debian-11-r15/5/debian-11/Dockerfile) +- [`5`, `5-debian-11`, `5.9.3`, `5.9.3-debian-11-r16` (5/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.9.3-debian-11-r16/5/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).