diff --git a/bitnami/wordpress-nginx/6/debian-11/Dockerfile b/bitnami/wordpress-nginx/6/debian-11/Dockerfile index 497053fef7a3..491b20b86389 100644 --- a/bitnami/wordpress-nginx/6/debian-11/Dockerfile +++ b/bitnami/wordpress-nginx/6/debian-11/Dockerfile @@ -11,9 +11,9 @@ RUN install_packages acl ca-certificates curl gzip less libaudit1 libbrotli1 lib 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 "wp-cli" "2.6.0-151" --checksum b426a51a33d93a22917e843161af356f733e806293bab5b93ddacf9b4041a5b7 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx" "1.22.0-151" --checksum 4c1cffbf2d5f9f767bc364dd341d540be918dea9022f434c1d608819736cf718 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx" "1.22.0-152" --checksum b3b69cb01d9289df0b365ce675ae4297a93022696db94f8cd31a1f443244963d RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.8-150" --checksum b47e1015fc1c9ce456f134ffd5b6ac6960c3f369c96fcd37319e9289b29a1047 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "6.0.0-158" --checksum 0ea42f4c7e91b50d3809fec737b7abc9fb6e463b68a7069c456ddd79a851aac6 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "6.0.0-159" --checksum 4cbcdc903c936cdef62d204166fa6a6653a961520c4f4e6b5200f101a6b63d86 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-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a144c36c271b..291efc9bfd61 100644 --- a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,10 +15,10 @@ }, "nginx": { "arch": "amd64", - "digest": "4c1cffbf2d5f9f767bc364dd341d540be918dea9022f434c1d608819736cf718", + "digest": "b3b69cb01d9289df0b365ce675ae4297a93022696db94f8cd31a1f443244963d", "distro": "debian-11", "type": "NAMI", - "version": "1.22.0-151" + "version": "1.22.0-152" }, "php": { "arch": "amd64", @@ -36,10 +36,10 @@ }, "wordpress": { "arch": "amd64", - "digest": "0ea42f4c7e91b50d3809fec737b7abc9fb6e463b68a7069c456ddd79a851aac6", + "digest": "4cbcdc903c936cdef62d204166fa6a6653a961520c4f4e6b5200f101a6b63d86", "distro": "debian-11", "type": "NAMI", - "version": "6.0.0-158" + "version": "6.0.0-159" }, "wp-cli": { "arch": "amd64", diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh index fb50bb2e6fd5..39805898235a 100644 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh @@ -620,18 +620,16 @@ EOF 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']; + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_FORWARDED_HOST']; } - if ( ! empty( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) \&\& 'https' === $_SERVER['HTTP_X_FORWARDED_PROTO'] ) { - $_SERVER['HTTPS'] = 'on'; + $_SERVER['HTTPS'] = 'on'; } EOF )" @@ -651,7 +649,6 @@ wordpress_configure_urls() { # Note that wp-config.php is officially indented via tabs, not spaces wordpress_conf_append "$( cat <<"EOF" - /** * The WP_SITEURL and WP_HOME options are configured to access from any hostname or IP address. * If you want to access only from an specific domain, you can modify them. For example: diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh index 9deccc1bc9d1..f3d133d0ce1c 100644 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh @@ -44,13 +44,13 @@ wordpress_env_vars=( WORDPRESS_SECURE_AUTH_SALT WORDPRESS_LOGGED_IN_SALT WORDPRESS_NONCE_SALT + WORDPRESS_ENABLE_REVERSE_PROXY WORDPRESS_USERNAME WORDPRESS_PASSWORD WORDPRESS_EMAIL WORDPRESS_FIRST_NAME WORDPRESS_LAST_NAME WORDPRESS_ENABLE_MULTISITE - WORDPRESS_ENABLE_REVERSE_PROXY WORDPRESS_MULTISITE_NETWORK_TYPE WORDPRESS_MULTISITE_EXTERNAL_HTTP_PORT_NUMBER WORDPRESS_MULTISITE_EXTERNAL_HTTPS_PORT_NUMBER diff --git a/bitnami/wordpress-nginx/README.md b/bitnami/wordpress-nginx/README.md index 4996d91a4c6a..4c276d8d5de1 100644 --- a/bitnami/wordpress-nginx/README.md +++ b/bitnami/wordpress-nginx/README.md @@ -35,7 +35,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -- [`6`, `6-debian-11`, `6.0.0`, `6.0.0-debian-11-r11`, `latest` (6/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/6.0.0-debian-11-r11/6/debian-11/Dockerfile) +- [`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-nginx/blob/6.0.0-debian-11-r12/6/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/wordpress-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress-nginx). @@ -238,6 +238,7 @@ Available environment variables: - `WORDPRESS_ENABLE_HTTPS`: Whether to use HTTPS by default. Default: **no** - `WORDPRESS_SKIP_BOOTSTRAP`: Skip the WordPress installation wizard. This is necessary when providing a database with existing WordPress data. Default: **no** - `WORDPRESS_AUTO_UPDATE_LEVEL`: Level of auto-updates to allow for the WordPress core installation. Valid values: `major`, `minor`, `none`. Default: **none** +- `WORDPRESS_ENABLE_REVERSE_PROXY`: Enable WordPress support for reverse proxy headers. Default: **no** ##### Multisite configuration @@ -248,7 +249,6 @@ Available environment variables: - `WORDPRESS_MULTISITE_NETWORK_TYPE`: WordPress Multisite network type to enable. Valid values: `subfolder`, `subdirectory`, `subdomain`. Default: **subdomain** - `WORDPRESS_MULTISITE_ENABLE_NIP_IO_REDIRECTION`: Whether to enable IP address redirection to nip.io wildcard DNS when enabling WordPress Multisite. This is useful when running on an IP address with subdomain network type. Default: **no** - `WORDPRESS_MULTISITE_FILEUPLOAD_MAXK`: Maximum upload file size allowed for WordPress Multisite uploads, in kilobytes. Default: **81920** -- `WORDPRESS_ENABLE_REVERSE_PROXY`: Enable WordPress support for reverse proxy headers. Default: **no** ##### Database connection configuration