diff --git a/bitnami/wordpress-nginx/7/debian-12/Dockerfile b/bitnami/wordpress-nginx/7/debian-12/Dockerfile index 843a95d251dc..c24209fb244d 100644 --- a/bitnami/wordpress-nginx/7/debian-12/Dockerfile +++ b/bitnami/wordpress-nginx/7/debian-12/Dockerfile @@ -3,11 +3,11 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-08T15:10:36Z" \ + org.opencontainers.image.created="2026-06-11T03:39:47Z" \ 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.source="https://github.com/bitnami/containers/tree/main/bitnami/wordpress-nginx" \ @@ -28,16 +28,16 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \ - "php-8.4.22-0-linux-${OS_ARCH}-debian-12" \ - "nginx-1.31.1-0-linux-${OS_ARCH}-debian-12" \ - "mysql-client-12.3.2-0-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.9-167-linux-${OS_ARCH}-debian-12" \ + "php-8.4.22-1-linux-${OS_ARCH}-debian-12" \ + "nginx-1.31.1-1-linux-${OS_ARCH}-debian-12" \ + "mysql-client-12.3.2-1-linux-${OS_ARCH}-debian-12" \ "postgresql-lib-18.4.0-0-linux-${OS_ARCH}-debian-12" \ "wordpress-nginx-7.0.0-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ fi ; \ sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ @@ -58,7 +58,7 @@ RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh RUN /opt/bitnami/scripts/wordpress/postunpack.sh ENV APP_VERSION="7.0.0" \ BITNAMI_APP_NAME="wordpress-nginx" \ - IMAGE_REVISION="5" \ + IMAGE_REVISION="6" \ LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 2c4b9a209395..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -5b884dec9384b513fa919005e7db53fc817949bcbc3e88c61e49d12af6753a08 mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index dd83bcc13e29..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -c6cd215fe18568f3015248adc87362e42edc3a9d342ec31be0ddc6e1abbf7c25 mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d17591dc0dd5 --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +46ca140ab41ac9597dfec2b2625a5d8681c159b6b2ad92f543d4eb6443227d21 mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..0eb98ce3eb1a --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +2ccf3157716201038f8efd1b7f183909268ede24a2f31339477011f15611c744 mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 5942f97ff88f..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -8cf73a152d7bd8d905e1d95c20f606b6906927e08a20c851ecc86beba7999e43 nginx-1.31.1-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index cde862a02c7d..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -e3cbff22912e1de7ac81c3604900e5c1c83cc0be025211bb2a00f382923f4d12 nginx-1.31.1-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..578584691823 --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +5bb44dde300969ec4c2b84453e64a6f14a095e2e651841bff27c049bd74e3b95 nginx-1.31.1-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..97c96cb61009 --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +c6dd41ec7b6c712d298b315382963ac5a560b8c2ba5ea5c18fc8925ac70f2a35 nginx-1.31.1-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index cd953e290383..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -7b11b57a999706bc3223a252064deaabdd15c8d43e76940ec34263e0e9e989ae php-8.4.22-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 7628cf52a672..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -d56d9e10d184a46d4eef6e16963bee199c7a1dfdddfc682e25a81970e1c3843b php-8.4.22-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..8826fc85a20d --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +fa6a2f744c04fd308f9ce78cae7dc097fd5de6896ab94144fce2d5bf1b33f2ac php-8.4.22-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..ee49932bb258 --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +03d2ae1bb27a1385e619261fe7a757be2b4be99335aa0673c3907d668da09e67 php-8.4.22-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 09a2ab4133ea..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -e2467be27e79a387c78b8ef3a57ceaa07bea65009972571f20dcf58631656e0b render-template-1.0.9-166-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 25ae43b180a6..000000000000 --- a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -c2c7634c5c0882d2dbd822744f6b5bdb074a07a1abf710c67e1206f1c20b8afa render-template-1.0.9-166-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5678e3bf679f --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f311b56146985169ff7d24083cbb4786b68f3f668707ec04901b54b91bec4d98 render-template-1.0.9-167-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..8b1c3ffbce03 --- /dev/null +++ b/bitnami/wordpress-nginx/7/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +0904d2f41140fa1f027ab31e6303d5f648a71b9ab241510a69188f7970d59c02 render-template-1.0.9-167-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh index 97ab588065ce..2fce29970c1a 100644 --- a/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -1017,6 +1017,17 @@ mysql_client_flavor() { fi } +# Helper to get the proper value for the MySQL client environment variable +mysql_client_env_value() { + local env_name="MYSQL_CLIENT_${1:?missing name}" + if [[ -n "${!env_name:-}" ]]; then + echo "${!env_name:-}" + else + env_name="DB_CLIENT_${1}" + echo "${!env_name:-}" + fi +} + ######################## # Prints extra options for MySQL client calls (i.e. SSL options) # Globals: @@ -1027,16 +1038,6 @@ mysql_client_flavor() { # List of options to pass to "mysql" CLI ######################### mysql_client_extra_opts() { - # Helper to get the proper value for the MySQL client environment variable - mysql_client_env_value() { - local env_name="MYSQL_CLIENT_${1:?missing name}" - if [[ -n "${!env_name:-}" ]]; then - echo "${!env_name:-}" - else - env_name="DB_CLIENT_${1}" - echo "${!env_name:-}" - fi - } local -a opts=() local key value if is_boolean_yes "${DB_ENABLE_SSL:-no}"; then diff --git a/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh index 80dceff58cfd..f3f033515cc0 100644 --- a/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/wordpress-nginx/7/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh @@ -588,14 +588,15 @@ nginx_update_app_configuration() { rename_conf_file() { local -r origin="$1" local -r destination="$2" - if is_file_writable "$origin" && is_file_writable "$destination"; then - warn "Could not rename server block file '${origin}' to '${destination}' due to lack of permissions." - else - mv "$origin" "$destination" + if ! is_file_writable "$origin" || ! is_file_writable "$destination"; then + warn "Could not rename server block file '${origin}' to '${destination}': lack of permissions." + return 1 fi + mv "$origin" "$destination" } - is_boolean_yes "$disable_http" && [[ -e "$http_server_block" ]] && rename_conf_file "${http_server_block}${disable_suffix}" "$http_server_block" - is_boolean_yes "$disable_https" && [[ -e "$https_server_block" ]] && rename_conf_file "${https_server_block}${disable_suffix}" "$https_server_block" + local -r disable_suffix=".disabled" + is_boolean_yes "$disable_http" && [[ -e "$http_server_block" ]] && rename_conf_file "${http_server_block}" "${http_server_block}${disable_suffix}" + is_boolean_yes "$disable_https" && [[ -e "$https_server_block" ]] && rename_conf_file "$https_server_block" "${https_server_block}${disable_suffix}" is_boolean_yes "$enable_http" && [[ -e "${http_server_block}${disable_suffix}" ]] && rename_conf_file "${http_server_block}${disable_suffix}" "$http_server_block" is_boolean_yes "$enable_https" && [[ -e "${https_server_block}${disable_suffix}" ]] && rename_conf_file "${https_server_block}${disable_suffix}" "$https_server_block" # Update only configuration files without the '.disabled' suffix