From e90a1d136e430551fe7752d468fc4e657f97ae26 Mon Sep 17 00:00:00 2001 From: bwdutton Date: Mon, 24 Feb 2020 20:54:04 -0800 Subject: [PATCH] add support for docker/automated installs --- installer/cli.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/installer/cli.php b/installer/cli.php index 9b2663e7..23e22290 100644 --- a/installer/cli.php +++ b/installer/cli.php @@ -85,13 +85,15 @@ function oops($message) { } function parse_cli_params() { - $config = array("host" => "localhost", - "user" => "root", - "password" => "", - "dbname" => "gallery3", - "prefix" => "", - "g3_password" => "", - "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql"); + $config = array( + "host" => getenv('MYSQL_HOST') ? getenv('MYSQL_HOST') : "localhost", + "user" => getenv('MYSQL_USER') ? getenv('MYSQL_USER') : "root", + "password" => getenv('MYSQL_PASSWORD') ? getenv('MYSQL_PASSWORD') : "", + "dbname" => getenv('MYSQL_DATABASE') ? getenv('MYSQL_DATABASE') : "gallery3", + "prefix" => getenv('DB_PREFIX') ? getenv('DB_PREFIX') : "", + "g3_password" => getenv('G3_PASSWORD') ? getenv('G3_PASSWORD') : "", + "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql", + ); $argv = $_SERVER["argv"]; for ($i = 1; $i < count($argv); $i++) {