From cb4dee629a6dbc942cb218f3d8516e71eb13b27e Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 12 Aug 2025 11:29:25 -0700
Subject: [PATCH] Apply upstream default charset change

See https://github.com/WordPress/WordPress/commit/08d1cf75096cd06b5fb10a379789c741bbd83771

> `utf8mb4` is the complete UTF-8 implementation in MySQL, supporting the full range of Unicode characters by using up to 4 bytes per character. This includes characters outside the Basic Multilingual Plane, such as emoji and supplementary characters. `utf8mb4` ensures full compatibility with modern text content and diverse character sets.
>
> As of WordPress 4.2, on both new and existing installations, WordPress would automatically upgrade database tables to `utf8mb4` on compatible servers (MySQL 5.5.3 or later). However, the default `DB_CHARSET` value during setup was still set to `utf8` for compatibility with older MySQL versions.
>
> As of WordPress 6.5, the minimum required MySQL version is 5.5.5, so the default can be updated to `utf8mb4`.

(We're currently on WordPress 6.8 here, but this default arguably makes sense to us much further back because we only support non-EOL MySQL versions.)
---
 beta/php8.1/apache/wp-config-docker.php       | 2 +-
 beta/php8.1/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php8.1/fpm/wp-config-docker.php          | 2 +-
 beta/php8.2/apache/wp-config-docker.php       | 2 +-
 beta/php8.2/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php8.2/fpm/wp-config-docker.php          | 2 +-
 beta/php8.3/apache/wp-config-docker.php       | 2 +-
 beta/php8.3/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php8.3/fpm/wp-config-docker.php          | 2 +-
 beta/php8.4/apache/wp-config-docker.php       | 2 +-
 beta/php8.4/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php8.4/fpm/wp-config-docker.php          | 2 +-
 latest/php8.1/apache/wp-config-docker.php     | 2 +-
 latest/php8.1/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php8.1/fpm/wp-config-docker.php        | 2 +-
 latest/php8.2/apache/wp-config-docker.php     | 2 +-
 latest/php8.2/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php8.2/fpm/wp-config-docker.php        | 2 +-
 latest/php8.3/apache/wp-config-docker.php     | 2 +-
 latest/php8.3/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php8.3/fpm/wp-config-docker.php        | 2 +-
 latest/php8.4/apache/wp-config-docker.php     | 2 +-
 latest/php8.4/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php8.4/fpm/wp-config-docker.php        | 2 +-
 wp-config-docker.php                          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/beta/php8.1/apache/wp-config-docker.php b/beta/php8.1/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.1/apache/wp-config-docker.php
+++ b/beta/php8.1/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.1/fpm-alpine/wp-config-docker.php b/beta/php8.1/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.1/fpm-alpine/wp-config-docker.php
+++ b/beta/php8.1/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.1/fpm/wp-config-docker.php b/beta/php8.1/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.1/fpm/wp-config-docker.php
+++ b/beta/php8.1/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.2/apache/wp-config-docker.php b/beta/php8.2/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.2/apache/wp-config-docker.php
+++ b/beta/php8.2/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.2/fpm-alpine/wp-config-docker.php b/beta/php8.2/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.2/fpm-alpine/wp-config-docker.php
+++ b/beta/php8.2/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.2/fpm/wp-config-docker.php b/beta/php8.2/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.2/fpm/wp-config-docker.php
+++ b/beta/php8.2/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.3/apache/wp-config-docker.php b/beta/php8.3/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.3/apache/wp-config-docker.php
+++ b/beta/php8.3/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.3/fpm-alpine/wp-config-docker.php b/beta/php8.3/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.3/fpm-alpine/wp-config-docker.php
+++ b/beta/php8.3/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.3/fpm/wp-config-docker.php b/beta/php8.3/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.3/fpm/wp-config-docker.php
+++ b/beta/php8.3/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.4/apache/wp-config-docker.php b/beta/php8.4/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.4/apache/wp-config-docker.php
+++ b/beta/php8.4/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.4/fpm-alpine/wp-config-docker.php b/beta/php8.4/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.4/fpm-alpine/wp-config-docker.php
+++ b/beta/php8.4/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/beta/php8.4/fpm/wp-config-docker.php b/beta/php8.4/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/beta/php8.4/fpm/wp-config-docker.php
+++ b/beta/php8.4/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.1/apache/wp-config-docker.php b/latest/php8.1/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.1/apache/wp-config-docker.php
+++ b/latest/php8.1/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.1/fpm-alpine/wp-config-docker.php b/latest/php8.1/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.1/fpm-alpine/wp-config-docker.php
+++ b/latest/php8.1/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.1/fpm/wp-config-docker.php b/latest/php8.1/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.1/fpm/wp-config-docker.php
+++ b/latest/php8.1/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.2/apache/wp-config-docker.php b/latest/php8.2/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.2/apache/wp-config-docker.php
+++ b/latest/php8.2/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.2/fpm-alpine/wp-config-docker.php b/latest/php8.2/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.2/fpm-alpine/wp-config-docker.php
+++ b/latest/php8.2/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.2/fpm/wp-config-docker.php b/latest/php8.2/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.2/fpm/wp-config-docker.php
+++ b/latest/php8.2/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.3/apache/wp-config-docker.php b/latest/php8.3/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.3/apache/wp-config-docker.php
+++ b/latest/php8.3/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.3/fpm-alpine/wp-config-docker.php b/latest/php8.3/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.3/fpm-alpine/wp-config-docker.php
+++ b/latest/php8.3/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.3/fpm/wp-config-docker.php b/latest/php8.3/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.3/fpm/wp-config-docker.php
+++ b/latest/php8.3/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.4/apache/wp-config-docker.php b/latest/php8.4/apache/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.4/apache/wp-config-docker.php
+++ b/latest/php8.4/apache/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.4/fpm-alpine/wp-config-docker.php b/latest/php8.4/fpm-alpine/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.4/fpm-alpine/wp-config-docker.php
+++ b/latest/php8.4/fpm-alpine/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/latest/php8.4/fpm/wp-config-docker.php b/latest/php8.4/fpm/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/latest/php8.4/fpm/wp-config-docker.php
+++ b/latest/php8.4/fpm/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );
diff --git a/wp-config-docker.php b/wp-config-docker.php
index 6df9809db8..ada2ee3c9e 100644
--- a/wp-config-docker.php
+++ b/wp-config-docker.php
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
-define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
+define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8mb4') );
 
 /** The database collate type. Don't change this if in doubt. */
 define( 'DB_COLLATE', getenv_docker('WORDPRESS_DB_COLLATE', '') );