From 57572ac281f3f77846aef85641ca36a02e71458f Mon Sep 17 00:00:00 2001 From: Luis Fernando Gomes Date: Fri, 17 Aug 2018 19:41:29 -0300 Subject: [PATCH] Add DB_CHARSET and DB_COLLATE on docker-entrypoint.sh It should fix #312 --- php5.6/apache/docker-entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/php5.6/apache/docker-entrypoint.sh b/php5.6/apache/docker-entrypoint.sh index 3fb9374875..b45f6a545a 100755 --- a/php5.6/apache/docker-entrypoint.sh +++ b/php5.6/apache/docker-entrypoint.sh @@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then WORDPRESS_DB_USER WORDPRESS_DB_PASSWORD WORDPRESS_DB_NAME + WORDPRESS_DB_CHARSET + WORDPRESS_DB_COLLATE "${uniqueEnvs[@]/#/WORDPRESS_}" WORDPRESS_TABLE_PREFIX WORDPRESS_DEBUG @@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then : "${WORDPRESS_DB_USER:=root}" : "${WORDPRESS_DB_PASSWORD:=}" : "${WORDPRESS_DB_NAME:=wordpress}" + : "${WORDPRESS_DB_CHARSET:=utf8}" + : "${WORDPRESS_DB_COLLATE:=}" # version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks # https://github.com/docker-library/wordpress/issues/116 @@ -181,6 +185,8 @@ EOPHP set_config 'DB_USER' "$WORDPRESS_DB_USER" set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD" set_config 'DB_NAME' "$WORDPRESS_DB_NAME" + set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET" + set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE" for unique in "${uniqueEnvs[@]}"; do uniqVar="WORDPRESS_$unique"