Skip to content

Commit fd9aa6d

Browse files
committed
Pass env vars to php subprocess
1 parent 5ea7144 commit fd9aa6d

19 files changed

+171
-76
lines changed

beta/php7.3/apache/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.3/fpm-alpine/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.3/fpm/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.4/apache/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.4/fpm-alpine/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php7.4/fpm/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/apache/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/fpm-alpine/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/fpm/docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-entrypoint.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
8787
done
8888
fi
8989

90+
export WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST-"mysql"}
91+
export WORDPRESS_DB_USER=${WORDPRESS_DB_USER-"root"}
92+
export WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD-""}
93+
export WORDPRESS_DB_NAME=${WORDPRESS_DB_NAME-"mysql"}
94+
9095
if [ -z ${SKIP_DB_CREATION+x} ]; then
9196
if ! TERM=dumb php -- <<'EOPHP'
9297
<?php
@@ -96,15 +101,15 @@ $stderr = fopen('php://stderr', 'w');
96101
// "hostname:port"
97102
// https://codex.wordpress.org/Editing_wp-config.php#MySQL_Sockets_or_Pipes
98103
// "hostname:unix-socket-path"
99-
list($host, $socket) = getenv('WORDPRESS_DB_HOST') ? explode(':', getenv('WORDPRESS_DB_HOST'), 2) : 'mysql';
104+
list($host, $socket) = explode(':', getenv('WORDPRESS_DB_HOST'), 2);
100105
$port = 0;
101106
if (is_numeric($socket)) {
102107
$port = (int) $socket;
103108
$socket = null;
104109
}
105-
$user = getenv('WORDPRESS_DB_USER') ?: 'root';
106-
$pass = getenv('WORDPRESS_DB_PASSWORD') ?: '';
107-
$dbName = getenv('WORDPRESS_DB_NAME') ?: 'wordpress';
110+
$user = getenv('WORDPRESS_DB_USER');
111+
$pass = getenv('WORDPRESS_DB_PASSWORD');
112+
$dbName = getenv('WORDPRESS_DB_NAME');
108113
$maxTries = 10;
109114
do {
110115
$mysql = new mysqli($host, $user, $pass, '', $port, $socket);

0 commit comments

Comments
 (0)