From 5b968c0c55c34e8d1a05dc7590da57cb817a8acf Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Jun 2024 00:07:11 +0200 Subject: [PATCH] [bitnami/wordpress-nginx] Release 6.5.4-debian-12-r3 (#67975) Signed-off-by: Bitnami Containers --- .../wordpress-nginx/6/debian-12/Dockerfile | 10 +- .../opt/bitnami/.bitnami_components.json | 6 +- .../opt/bitnami/scripts/libwordpress.sh | 4 +- .../opt/bitnami/scripts/wordpress-env.sh | 8 ++ bitnami/wordpress-nginx/README.md | 110 +++++++++--------- 5 files changed, 74 insertions(+), 64 deletions(-) diff --git a/bitnami/wordpress-nginx/6/debian-12/Dockerfile b/bitnami/wordpress-nginx/6/debian-12/Dockerfile index 17a0c281d1c3..218e0a04c62f 100644 --- a/bitnami/wordpress-nginx/6/debian-12/Dockerfile +++ b/bitnami/wordpress-nginx/6/debian-12/Dockerfile @@ -7,11 +7,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-06-07T14:29:06Z" \ + org.opencontainers.image.created="2024-06-19T21:23:17Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/wordpress-nginx/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.5.4-debian-12-r2" \ + org.opencontainers.image.ref.name="6.5.4-debian-12-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wordpress-nginx" \ org.opencontainers.image.title="wordpress-nginx" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -29,10 +29,10 @@ RUN install_packages acl ca-certificates curl gettext less libaudit1 libbrotli1 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "render-template-1.0.6-14-linux-${OS_ARCH}-debian-12" \ - "php-8.2.20-1-linux-${OS_ARCH}-debian-12" \ - "nginx-1.27.0-0-linux-${OS_ARCH}-debian-12" \ + "php-8.2.20-5-linux-${OS_ARCH}-debian-12" \ + "nginx-1.27.0-1-linux-${OS_ARCH}-debian-12" \ "mysql-client-11.3.2-3-linux-${OS_ARCH}-debian-12" \ - "wordpress-nginx-6.5.4-2-linux-${OS_ARCH}-debian-12" \ + "wordpress-nginx-6.5.4-4-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 7eb3b5a3a67b..acc5dea5f312 100644 --- a/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,13 +9,13 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.27.0-0" + "version": "1.27.0-1" }, "php": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.2.20-1" + "version": "8.2.20-5" }, "render-template": { "arch": "amd64", @@ -27,6 +27,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "6.5.4-2" + "version": "6.5.4-4" } } \ No newline at end of file diff --git a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libwordpress.sh b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libwordpress.sh index a2f6fd4bcbe4..608efbd85dcd 100644 --- a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libwordpress.sh +++ b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libwordpress.sh @@ -663,8 +663,8 @@ wordpress_configure_smtp() { fi wp_execute plugin install wp-mail-smtp "${install_smtp_plugin_args[@]}" info "Configuring SMTP settings" - wp_execute option patch update wp_mail_smtp mail from_email "$WORDPRESS_SMTP_USER" - wp_execute option patch update wp_mail_smtp mail from_name "${WORDPRESS_FIRST_NAME} ${WORDPRESS_LAST_NAME}" + wp_execute option patch update wp_mail_smtp mail from_email "$WORDPRESS_SMTP_FROM_EMAIL" + wp_execute option patch update wp_mail_smtp mail from_name "$WORDPRESS_SMTP_FROM_NAME" wp_execute option patch update wp_mail_smtp mail mailer "smtp" wp_execute option patch insert wp_mail_smtp smtp host "$WORDPRESS_SMTP_HOST" wp_execute option patch insert wp_mail_smtp smtp port "$WORDPRESS_SMTP_PORT_NUMBER" diff --git a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/wordpress-env.sh index 96f61951f48e..dae47b7ac628 100644 --- a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/wordpress-env.sh +++ b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/wordpress-env.sh @@ -63,6 +63,8 @@ wordpress_env_vars=( WORDPRESS_SMTP_HOST WORDPRESS_SMTP_PORT_NUMBER WORDPRESS_SMTP_USER + WORDPRESS_SMTP_FROM_EMAIL + WORDPRESS_SMTP_FROM_NAME WORDPRESS_SMTP_PASSWORD WORDPRESS_SMTP_PROTOCOL WORDPRESS_DATABASE_HOST @@ -86,6 +88,8 @@ wordpress_env_vars=( SMTP_PORT WORDPRESS_SMTP_PORT SMTP_USER + SMTP_FROM_EMAIL + SMTP_FROM_NAME SMTP_PASSWORD SMTP_PROTOCOL MARIADB_HOST @@ -175,6 +179,10 @@ WORDPRESS_SMTP_PORT_NUMBER="${WORDPRESS_SMTP_PORT_NUMBER:-"${WORDPRESS_SMTP_PORT export WORDPRESS_SMTP_PORT_NUMBER="${WORDPRESS_SMTP_PORT_NUMBER:-}" # only used during the first initialization WORDPRESS_SMTP_USER="${WORDPRESS_SMTP_USER:-"${SMTP_USER:-}"}" export WORDPRESS_SMTP_USER="${WORDPRESS_SMTP_USER:-}" # only used during the first initialization +WORDPRESS_SMTP_FROM_EMAIL="${WORDPRESS_SMTP_FROM_EMAIL:-"${SMTP_FROM_EMAIL:-}"}" +export WORDPRESS_SMTP_FROM_EMAIL="${WORDPRESS_SMTP_FROM_EMAIL:-${WORDPRESS_SMTP_USER}}" # only used during the first initialization +WORDPRESS_SMTP_FROM_NAME="${WORDPRESS_SMTP_FROM_NAME:-"${SMTP_FROM_NAME:-}"}" +export WORDPRESS_SMTP_FROM_NAME="${WORDPRESS_SMTP_FROM_NAME:-${WORDPRESS_FIRST_NAME} ${WORDPRESS_LAST_NAME}}" # only used during the first initialization WORDPRESS_SMTP_PASSWORD="${WORDPRESS_SMTP_PASSWORD:-"${SMTP_PASSWORD:-}"}" export WORDPRESS_SMTP_PASSWORD="${WORDPRESS_SMTP_PASSWORD:-}" # only used during the first initialization WORDPRESS_SMTP_PROTOCOL="${WORDPRESS_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}" diff --git a/bitnami/wordpress-nginx/README.md b/bitnami/wordpress-nginx/README.md index 5afab4814b84..d80bb026ada7 100644 --- a/bitnami/wordpress-nginx/README.md +++ b/bitnami/wordpress-nginx/README.md @@ -194,60 +194,62 @@ docker run -d --name wordpress \ #### Customizable environment variables -| Name | Description | Default Value | -|--------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------| -| `WORDPRESS_DATA_TO_PERSIST` | Files to persist relative to the WordPress installation directory. To provide multiple values, separate them with a whitespace. | `wp-config.php wp-content` | -| `WORDPRESS_ENABLE_HTTPS` | Whether to enable HTTPS for WordPress by default. | `no` | -| `WORDPRESS_BLOG_NAME` | WordPress blog name. | `"User's blog"` | -| `WORDPRESS_SCHEME` | Scheme to generate application URLs. Deprecated by `WORDPRESS_ENABLE_HTTPS`. | `http` | -| `WORDPRESS_HTACCESS_OVERRIDE_NONE` | Set the Apache `AllowOverride` variable to `None`. All the default directives will be loaded from `/opt/bitnami/wordpress/wordpress-htaccess.conf`. | `yes` | -| `WORDPRESS_ENABLE_HTACCESS_PERSISTENCE` | Persist the custom changes of the htaccess. It depends on the value of `WORDPRESS_HTACCESS_OVERRIDE_NONE`, when `yes` it will persist `/opt/bitnami/wordpress/wordpress-htaccess.conf` if `no` it will persist `/opt/bitnami/wordpress/.htaccess`. | `no` | -| `WORDPRESS_RESET_DATA_PERMISSIONS` | Force resetting ownership/permissions on persisted data when initializing, otherwise it assumes the ownership/permissions are correct. Ignored when running as non-root. | `no` | -| `WORDPRESS_TABLE_PREFIX` | Table prefix to use in WordPress. | `wp_` | -| `WORDPRESS_PLUGINS` | List of WordPress plugins to install and activate, separated via commas. Can also be set to `all` to activate all currently installed plugins, or `none` to skip. | `none` | -| `WORDPRESS_EXTRA_INSTALL_ARGS` | Extra flags to append to the WordPress 'wp core install' command call. | `nil` | -| `WORDPRESS_EXTRA_CLI_ARGS` | Extra flags to append to all WP-CLI command calls. | `nil` | -| `WORDPRESS_EXTRA_WP_CONFIG_CONTENT` | Extra configuration to append to wp-config.php during install. | `nil` | -| `WORDPRESS_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `no` | -| `WORDPRESS_AUTO_UPDATE_LEVEL` | Level of auto-updates to allow for the WordPress core installation. Valid values: `major`, `minor`, `none`. | `none` | -| `WORDPRESS_AUTH_KEY` | Value of the AUTH_KEY | `nil` | -| `WORDPRESS_SECURE_AUTH_KEY` | Value of the SECURE_AUTH_KEY | `nil` | -| `WORDPRESS_LOGGED_IN_KEY` | Value of the LOGGED_IN_KEY | `nil` | -| `WORDPRESS_NONCE_KEY` | Value of the NONCE_KEY | `nil` | -| `WORDPRESS_AUTH_SALT` | Value of the AUTH_SALT | `nil` | -| `WORDPRESS_SECURE_AUTH_SALT` | Value of the SECURE_AUTH_SALT | `nil` | -| `WORDPRESS_LOGGED_IN_SALT` | Value of the LOGGED_IN_SALT | `nil` | -| `WORDPRESS_NONCE_SALT` | Value of the NONCE_SALT | `nil` | -| `WORDPRESS_ENABLE_REVERSE_PROXY` | Enable WordPress support for reverse proxy headers | `no` | -| `WORDPRESS_ENABLE_XML_RPC` | Enable the WordPress XML-RPC endpoint | `no` | -| `WORDPRESS_USERNAME` | WordPress user name. | `user` | -| `WORDPRESS_PASSWORD` | WordPress user password. | `bitnami` | -| `WORDPRESS_EMAIL` | WordPress user e-mail address. | `user@example.com` | -| `WORDPRESS_FIRST_NAME` | WordPress user first name. | `UserName` | -| `WORDPRESS_LAST_NAME` | WordPress user last name. | `LastName` | -| `WORDPRESS_ENABLE_MULTISITE` | Enable WordPress Multisite configuration. | `no` | -| `WORDPRESS_MULTISITE_NETWORK_TYPE` | WordPress Multisite network type to enable. Valid values: `subfolder`, `subdirectory`, `subdomain`. | `subdomain` | -| `WORDPRESS_MULTISITE_EXTERNAL_HTTP_PORT_NUMBER` | External HTTP port for WordPress Multisite. | `80` | -| `WORDPRESS_MULTISITE_EXTERNAL_HTTPS_PORT_NUMBER` | External HTTPS port for WordPress Multisite. | `443` | -| `WORDPRESS_MULTISITE_HOST` | WordPress hostname/address. Only used for Multisite installations. | `nil` | -| `WORDPRESS_MULTISITE_ENABLE_NIP_IO_REDIRECTION` | Whether to enable IP address redirection to nip.io wildcard DNS when enabling WordPress Multisite. This is only supported when running on an IP address with subdomain network type. | `no` | -| `WORDPRESS_MULTISITE_FILEUPLOAD_MAXK` | Maximum upload file size allowed for WordPress Multisite uploads, in kilobytes. | `81920` | -| `WORDPRESS_SMTP_HOST` | WordPress SMTP server host. | `nil` | -| `WORDPRESS_SMTP_PORT_NUMBER` | WordPress SMTP server port number. | `nil` | -| `WORDPRESS_SMTP_USER` | WordPress SMTP server user. | `nil` | -| `WORDPRESS_SMTP_PASSWORD` | WordPress SMTP server user password. | `nil` | -| `WORDPRESS_SMTP_PROTOCOL` | WordPress SMTP server protocol to use. | `nil` | -| `WORDPRESS_DATABASE_HOST` | Database server host. | `$WORDPRESS_DEFAULT_DATABASE_HOST` | -| `WORDPRESS_DATABASE_PORT_NUMBER` | Database server port. | `3306` | -| `WORDPRESS_DATABASE_NAME` | Database name. | `bitnami_wordpress` | -| `WORDPRESS_DATABASE_USER` | Database user name. | `bn_wordpress` | -| `WORDPRESS_DATABASE_PASSWORD` | Database user password. | `nil` | -| `WORDPRESS_ENABLE_DATABASE_SSL` | Whether to enable SSL for database connections. | `no` | -| `WORDPRESS_VERIFY_DATABASE_SSL` | Whether to verify the database SSL certificate when SSL is enabled for database connections. | `yes` | -| `WORDPRESS_DATABASE_SSL_CERT_FILE` | Path to the database client certificate file. | `nil` | -| `WORDPRESS_DATABASE_SSL_KEY_FILE` | Path to the database client certificate key file. | `nil` | -| `WORDPRESS_DATABASE_SSL_CA_FILE` | Path to the database server CA bundle file. | `nil` | -| `WORDPRESS_OVERRIDE_DATABASE_SETTINGS` | Override the database settings in persistence. | `no` | +| Name | Description | Default Value | +|--------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------| +| `WORDPRESS_DATA_TO_PERSIST` | Files to persist relative to the WordPress installation directory. To provide multiple values, separate them with a whitespace. | `wp-config.php wp-content` | +| `WORDPRESS_ENABLE_HTTPS` | Whether to enable HTTPS for WordPress by default. | `no` | +| `WORDPRESS_BLOG_NAME` | WordPress blog name. | `"User's blog"` | +| `WORDPRESS_SCHEME` | Scheme to generate application URLs. Deprecated by `WORDPRESS_ENABLE_HTTPS`. | `http` | +| `WORDPRESS_HTACCESS_OVERRIDE_NONE` | Set the Apache `AllowOverride` variable to `None`. All the default directives will be loaded from `/opt/bitnami/wordpress/wordpress-htaccess.conf`. | `yes` | +| `WORDPRESS_ENABLE_HTACCESS_PERSISTENCE` | Persist the custom changes of the htaccess. It depends on the value of `WORDPRESS_HTACCESS_OVERRIDE_NONE`, when `yes` it will persist `/opt/bitnami/wordpress/wordpress-htaccess.conf` if `no` it will persist `/opt/bitnami/wordpress/.htaccess`. | `no` | +| `WORDPRESS_RESET_DATA_PERMISSIONS` | Force resetting ownership/permissions on persisted data when initializing, otherwise it assumes the ownership/permissions are correct. Ignored when running as non-root. | `no` | +| `WORDPRESS_TABLE_PREFIX` | Table prefix to use in WordPress. | `wp_` | +| `WORDPRESS_PLUGINS` | List of WordPress plugins to install and activate, separated via commas. Can also be set to `all` to activate all currently installed plugins, or `none` to skip. | `none` | +| `WORDPRESS_EXTRA_INSTALL_ARGS` | Extra flags to append to the WordPress 'wp core install' command call. | `nil` | +| `WORDPRESS_EXTRA_CLI_ARGS` | Extra flags to append to all WP-CLI command calls. | `nil` | +| `WORDPRESS_EXTRA_WP_CONFIG_CONTENT` | Extra configuration to append to wp-config.php during install. | `nil` | +| `WORDPRESS_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `no` | +| `WORDPRESS_AUTO_UPDATE_LEVEL` | Level of auto-updates to allow for the WordPress core installation. Valid values: `major`, `minor`, `none`. | `none` | +| `WORDPRESS_AUTH_KEY` | Value of the AUTH_KEY | `nil` | +| `WORDPRESS_SECURE_AUTH_KEY` | Value of the SECURE_AUTH_KEY | `nil` | +| `WORDPRESS_LOGGED_IN_KEY` | Value of the LOGGED_IN_KEY | `nil` | +| `WORDPRESS_NONCE_KEY` | Value of the NONCE_KEY | `nil` | +| `WORDPRESS_AUTH_SALT` | Value of the AUTH_SALT | `nil` | +| `WORDPRESS_SECURE_AUTH_SALT` | Value of the SECURE_AUTH_SALT | `nil` | +| `WORDPRESS_LOGGED_IN_SALT` | Value of the LOGGED_IN_SALT | `nil` | +| `WORDPRESS_NONCE_SALT` | Value of the NONCE_SALT | `nil` | +| `WORDPRESS_ENABLE_REVERSE_PROXY` | Enable WordPress support for reverse proxy headers | `no` | +| `WORDPRESS_ENABLE_XML_RPC` | Enable the WordPress XML-RPC endpoint | `no` | +| `WORDPRESS_USERNAME` | WordPress user name. | `user` | +| `WORDPRESS_PASSWORD` | WordPress user password. | `bitnami` | +| `WORDPRESS_EMAIL` | WordPress user e-mail address. | `user@example.com` | +| `WORDPRESS_FIRST_NAME` | WordPress user first name. | `UserName` | +| `WORDPRESS_LAST_NAME` | WordPress user last name. | `LastName` | +| `WORDPRESS_ENABLE_MULTISITE` | Enable WordPress Multisite configuration. | `no` | +| `WORDPRESS_MULTISITE_NETWORK_TYPE` | WordPress Multisite network type to enable. Valid values: `subfolder`, `subdirectory`, `subdomain`. | `subdomain` | +| `WORDPRESS_MULTISITE_EXTERNAL_HTTP_PORT_NUMBER` | External HTTP port for WordPress Multisite. | `80` | +| `WORDPRESS_MULTISITE_EXTERNAL_HTTPS_PORT_NUMBER` | External HTTPS port for WordPress Multisite. | `443` | +| `WORDPRESS_MULTISITE_HOST` | WordPress hostname/address. Only used for Multisite installations. | `nil` | +| `WORDPRESS_MULTISITE_ENABLE_NIP_IO_REDIRECTION` | Whether to enable IP address redirection to nip.io wildcard DNS when enabling WordPress Multisite. This is only supported when running on an IP address with subdomain network type. | `no` | +| `WORDPRESS_MULTISITE_FILEUPLOAD_MAXK` | Maximum upload file size allowed for WordPress Multisite uploads, in kilobytes. | `81920` | +| `WORDPRESS_SMTP_HOST` | WordPress SMTP server host. | `nil` | +| `WORDPRESS_SMTP_PORT_NUMBER` | WordPress SMTP server port number. | `nil` | +| `WORDPRESS_SMTP_USER` | WordPress SMTP server user. | `nil` | +| `WORDPRESS_SMTP_FROM_EMAIL` | WordPress SMTP from email. | `${WORDPRESS_SMTP_USER}` | +| `WORDPRESS_SMTP_FROM_NAME` | WordPress SMTP from name. | `${WORDPRESS_FIRST_NAME} ${WORDPRESS_LAST_NAME}` | +| `WORDPRESS_SMTP_PASSWORD` | WordPress SMTP server user password. | `nil` | +| `WORDPRESS_SMTP_PROTOCOL` | WordPress SMTP server protocol to use. | `nil` | +| `WORDPRESS_DATABASE_HOST` | Database server host. | `$WORDPRESS_DEFAULT_DATABASE_HOST` | +| `WORDPRESS_DATABASE_PORT_NUMBER` | Database server port. | `3306` | +| `WORDPRESS_DATABASE_NAME` | Database name. | `bitnami_wordpress` | +| `WORDPRESS_DATABASE_USER` | Database user name. | `bn_wordpress` | +| `WORDPRESS_DATABASE_PASSWORD` | Database user password. | `nil` | +| `WORDPRESS_ENABLE_DATABASE_SSL` | Whether to enable SSL for database connections. | `no` | +| `WORDPRESS_VERIFY_DATABASE_SSL` | Whether to verify the database SSL certificate when SSL is enabled for database connections. | `yes` | +| `WORDPRESS_DATABASE_SSL_CERT_FILE` | Path to the database client certificate file. | `nil` | +| `WORDPRESS_DATABASE_SSL_KEY_FILE` | Path to the database client certificate key file. | `nil` | +| `WORDPRESS_DATABASE_SSL_CA_FILE` | Path to the database server CA bundle file. | `nil` | +| `WORDPRESS_OVERRIDE_DATABASE_SETTINGS` | Override the database settings in persistence. | `no` | #### Read-only environment variables