Merge pull request #533 from perftools/config-burn-in

Refactor: Update docker-compose setup not to require clone

Author: glensc

README.md

@@ -116,17 +116,16 @@ NOTE: PDO may not support all the features of XHGui, see [#320].
 
 This setup uses [docker-compose] to orchestrate docker containers.
 
-1. Clone or download `xhgui` from GitHub.
+1. Copy example [`docker-compose.yml`][docker-compose.yml] from this project
 
 2. Startup the containers: `docker-compose up -d`
 
 3. Open your browser at http://xhgui.127.0.0.1.nip.io:8142 or just http://localhost:8142 or type at terminal `composer open`
 
-4. To customize xhgui, copy `config/config.default.php` to `config/config.php` and edit that file.
-
-5. To customize docker-compose, copy `docker-compose.yml` to `docker-compose.override.yml` and edit that file.
+4. To customize xhgui, copy `src/config.default.php` to `config/config.php` and edit that file.
 
 [docker-compose]: https://docs.docker.com/compose/
+[docker-compose.yml]: https://github.com/perftools/xhgui/raw/HEAD/docker-compose.yml
 
 # Configuration
 

config/.gitignore

@@ -0,0 +1,2 @@
+*
+!/.gitignore

src/ServiceProvider/ConfigProvider.php

@@ -17,7 +17,7 @@ public function register(Container $app): void
                 define('XHGUI_ROOT_DIR', $app['app.dir']);
             }
 
-            Config::load($app['app.config_dir'] . '/config.default.php');
+            Config::load($app['app.dir'] . '/src/config.default.php');
 
             if (file_exists($app['app.config_dir'] . '/config.php')) {
                 Config::load($app['app.config_dir'] . '/config.php');

config/config.default.php src/config.default.phpconfig/config.default.php renamed to src/config.default.php

@@ -2,8 +2,8 @@
 /**
  * Default configuration for XHGui.
  *
- * To change these, create a file called `config.php` file in the same directory
- * and return an array from there with your overriding settings.
+ * To change these, create a file called `config/config.php` file
+ * and return an array from there with your new settings.
  */
 
 return [