Skip to content

Commit bcb12b9

Browse files
committed
Pass env vars to php subprocess
1 parent 4397943 commit bcb12b9

19 files changed

Lines changed: 152 additions & 152 deletions

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

Lines changed: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 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: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-entrypoint.sh

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

90-
WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST-"mysql"}
91-
WORDPRESS_DB_USER=${WORDPRESS_DB_USER-"root"}
92-
WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD-""}
93-
WORDPRESS_DB_NAME=${WORDPRESS_DB_NAME-"mysql"}
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"}
9494

9595
if [ -z ${SKIP_DB_CREATION+x} ]; then
9696
if ! TERM=dumb php -- <<'EOPHP'
@@ -101,15 +101,15 @@ $stderr = fopen('php://stderr', 'w');
101101
// "hostname:port"
102102
// https://codex.wordpress.org/Editing_wp-config.php#MySQL_Sockets_or_Pipes
103103
// "hostname:unix-socket-path"
104-
list($host, $socket) = getenv('WORDPRESS_DB_HOST') ? explode(':', getenv('WORDPRESS_DB_HOST'), 2) : 'mysql';
104+
list($host, $socket) = explode(':', getenv('WORDPRESS_DB_HOST'), 2);
105105
$port = 0;
106106
if (is_numeric($socket)) {
107107
$port = (int) $socket;
108108
$socket = null;
109109
}
110-
$user = getenv('WORDPRESS_DB_USER') ?: 'root';
111-
$pass = getenv('WORDPRESS_DB_PASSWORD') ?: '';
112-
$dbName = getenv('WORDPRESS_DB_NAME') ?: 'wordpress';
110+
$user = getenv('WORDPRESS_DB_USER');
111+
$pass = getenv('WORDPRESS_DB_PASSWORD');
112+
$dbName = getenv('WORDPRESS_DB_NAME');
113113
$maxTries = 10;
114114
do {
115115
$mysql = new mysqli($host, $user, $pass, '', $port, $socket);

0 commit comments

Comments
 (0)