Skip to content

Commit cb50cba

Browse files
tianontianon
committed
Apply DB_CHARSET/DB_COLLATE changes to all copies...
1 parent 4c9bb73 commit cb50cba

File tree

12 files changed

+72
-0
lines changed

12 files changed

+72
-0
lines changed

‎docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php5.6/fpm-alpine/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php5.6/fpm/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.0/apache/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.0/fpm-alpine/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.0/fpm/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.1/apache/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.1/fpm-alpine/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.1/fpm/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.2/apache/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.2/fpm-alpine/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

‎php7.2/fpm/docker-entrypoint.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
9090
WORDPRESS_DB_USER
9191
WORDPRESS_DB_PASSWORD
9292
WORDPRESS_DB_NAME
93+
WORDPRESS_DB_CHARSET
94+
WORDPRESS_DB_COLLATE
9395
"${uniqueEnvs[@]/#/WORDPRESS_}"
9496
WORDPRESS_TABLE_PREFIX
9597
WORDPRESS_DEBUG
@@ -122,6 +124,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
122124
: "${WORDPRESS_DB_USER:=root}"
123125
: "${WORDPRESS_DB_PASSWORD:=}"
124126
: "${WORDPRESS_DB_NAME:=wordpress}"
127+
: "${WORDPRESS_DB_CHARSET:=utf8}"
128+
: "${WORDPRESS_DB_COLLATE:=}"
125129

126130
# version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
127131
# https://github.com/docker-library/wordpress/issues/116
@@ -181,6 +185,8 @@ EOPHP
181185
set_config 'DB_USER' "$WORDPRESS_DB_USER"
182186
set_config 'DB_PASSWORD' "$WORDPRESS_DB_PASSWORD"
183187
set_config 'DB_NAME' "$WORDPRESS_DB_NAME"
188+
set_config 'DB_CHARSET' "$WORDPRESS_DB_CHARSET"
189+
set_config 'DB_COLLATE' "$WORDPRESS_DB_COLLATE"
184190

185191
for unique in "${uniqueEnvs[@]}"; do
186192
uniqVar="WORDPRESS_$unique"

0 commit comments

Comments
 (0)