diff --git a/bitnami/wordpress-intel/5/debian-10/Dockerfile b/bitnami/wordpress-intel/5/debian-10/Dockerfile index 8a720f8cbd42..287d67e99d52 100644 --- a/bitnami/wordpress-intel/5/debian-10/Dockerfile +++ b/bitnami/wordpress-intel/5/debian-10/Dockerfile @@ -15,7 +15,7 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.17-8" RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wp-cli" "2.6.0-4" --checksum fa48eb0bf1c92c18e4e82ab6cbde981bbf5d63116e0fb9b665bce6d84d9a52f2 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx-intel" "0.4.7-9" --checksum 6c7c70448a53cc68065376fb051055df94b1e1ae2bea84212f366007b98f1e02 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.7-4" --checksum 14329a8ec0a649ecb9ffb37085a547183748efedea8ed029801ab9b381ab7173 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "5.9.3-0" --checksum e3e6d7724d2ca8c6972a2decb3f0b799f1298cf41973bede6ab8a9ddfc64d1e6 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wordpress" "5.9.3-1" --checksum 2118dc1c31498b456e085960288bc935f17766136f7fa733e4d59b03a3815ea7 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives @@ -31,7 +31,6 @@ RUN /opt/bitnami/scripts/wordpress/postunpack.sh RUN /opt/bitnami/scripts/wp-cli/postunpack.sh ENV APP_VERSION="5.9.3" \ BITNAMI_APP_NAME="wordpress-intel" \ - BITNAMI_IMAGE_VERSION="5.9.3-debian-10-r0" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/wp-cli/bin:/opt/bitnami/nginx/sbin:/opt/bitnami/mysql/bin:$PATH" diff --git a/bitnami/wordpress-intel/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-intel/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 143f3451c76c..86995f89df9a 100644 --- a/bitnami/wordpress-intel/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress-intel/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -43,10 +43,10 @@ }, "wordpress": { "arch": "amd64", - "digest": "e3e6d7724d2ca8c6972a2decb3f0b799f1298cf41973bede6ab8a9ddfc64d1e6", + "digest": "2118dc1c31498b456e085960288bc935f17766136f7fa733e4d59b03a3815ea7", "distro": "debian-10", "type": "NAMI", - "version": "5.9.3-0" + "version": "5.9.3-1" }, "wp-cli": { "arch": "amd64", diff --git a/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh index fee929c4ee1a..bd3d43db6e43 100644 --- a/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -132,10 +132,14 @@ mysql_client_initialize() { # None ######################### mysql_client_wrap_binary_for_ssl() { - local -r wrapper_file="${DB_BIN_DIR}/mysql" + local wrapper_file="${DB_BIN_DIR}/mysql" + # In MySQL Client 10.6, mysql is a link to the mariadb binary + if [[ -f "${DB_BIN_DIR}/mariadb" ]]; then + wrapper_file="${DB_BIN_DIR}/mariadb" + fi local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql" local -a ssl_opts=() - read -r -a ssl_opts <<< "$(mysql_client_extra_opts)" + read -r -a ssl_opts <<<"$(mysql_client_extra_opts)" mv "$wrapper_file" "$wrapped_binary_file" cat >"$wrapper_file" <