From cc4e8008e10c3bdf8050bf6e80770217f0fe067a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 1 Aug 2024 21:32:07 +0200 Subject: [PATCH] [bitnami/wordpress-nginx] Release 6.6.1-debian-12-r2 (#70505) Signed-off-by: Bitnami Containers --- .../wordpress-nginx/6/debian-12/Dockerfile | 8 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../opt/bitnami/scripts/libmysqlclient.sh | 94 ++++++++++++++++++- 3 files changed, 99 insertions(+), 7 deletions(-) diff --git a/bitnami/wordpress-nginx/6/debian-12/Dockerfile b/bitnami/wordpress-nginx/6/debian-12/Dockerfile index 76da27e09fc0..b47a7480a218 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-07-25T08:43:34Z" \ + org.opencontainers.image.created="2024-08-01T19:03:41Z" \ 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.6.1-debian-12-r1" \ + org.opencontainers.image.ref.name="6.6.1-debian-12-r2" \ 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.7-2-linux-${OS_ARCH}-debian-12" \ - "php-8.2.21-2-linux-${OS_ARCH}-debian-12" \ + "php-8.2.22-0-linux-${OS_ARCH}-debian-12" \ "nginx-1.27.0-1-linux-${OS_ARCH}-debian-12" \ "mysql-client-11.4.2-0-linux-${OS_ARCH}-debian-12" \ - "wordpress-nginx-6.6.1-0-linux-${OS_ARCH}-debian-12" \ + "wordpress-nginx-6.6.1-1-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 336a2d5e30ac..92811256dc4e 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 @@ -15,7 +15,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.2.21-2" + "version": "8.2.22-0" }, "render-template": { "arch": "amd64", @@ -27,6 +27,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "6.6.1-0" + "version": "6.6.1-1" } } \ No newline at end of file diff --git a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh index ad32c9c374b6..3e2b3963bfbc 100644 --- a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -466,6 +466,98 @@ mysql_migrate_old_configuration() { fi } +######################## +# Ensure a db user exists with the given password for the '%' host +# Globals: +# DB_* +# Flags: +# -p|--password - database password +# -u|--user - database user +# --auth-plugin - authentication plugin +# --use-ldap - authenticate user via LDAP +# --host - database host +# --port - database host +# Arguments: +# $1 - database user +# Returns: +# None +######################### +mysql_ensure_user_exists() { + local -r user="${1:?user is required}" + local password="" + local auth_plugin="" + local use_ldap="no" + local hosts + local auth_string="" + # For accessing an external database + local db_host="" + local db_port="" + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + -p|--password) + shift + password="${1:?missing database password}" + ;; + --auth-plugin) + shift + auth_plugin="${1:?missing authentication plugin}" + ;; + --use-ldap) + use_ldap="yes" + ;; + --host) + shift + db_host="${1:?missing database host}" + ;; + --port) + shift + db_port="${1:?missing database port}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + if is_boolean_yes "$use_ldap"; then + auth_string="identified via pam using '$DB_FLAVOR'" + elif [[ -n "$password" ]]; then + if [[ -n "$auth_plugin" ]]; then + auth_string="identified with $auth_plugin by '$password'" + else + auth_string="identified by '$password'" + fi + fi + debug "creating database user \'$user\'" + + local -a mysql_execute_cmd=("mysql_execute") + local -a mysql_execute_print_output_cmd=("mysql_execute_print_output") + if [[ -n "$db_host" && -n "$db_port" ]]; then + mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port") + mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port") + fi + + local mysql_create_user_cmd + [[ "$DB_FLAVOR" = "mariadb" ]] && mysql_create_user_cmd="create or replace user" || mysql_create_user_cmd="create user if not exists" + "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <