mirror/php-tileserver
1
0
Fork 0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-18 04:11:39 +02:00
Code Issues Releases Wiki Activity

Get config from docker volumes if is provided

Browse Source
This commit is contained in:
Dalibor Janák
2016-03-01 11:57:18 +01:00
parent 8206bcccc7
commit 50630fe1c7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tileserver.php
View File

@@ -62,7 +62,10 @@ class Server {
* Set config * Set config
*/ */
public function __construct() { public function __construct() {
$this->config = $GLOBALS['config']; //Get config from docker volumes
$envConfig = $_ENV['config'] == null ? array() : $_ENV['config'];
$this->config = array_merge($GLOBALS['config'], $envConfig);
} }
/** /**