Skip to content
Snippets Groups Projects

5534 add docker

Merged Hahn Axel (hahn) requested to merge 5534-add-docker into master
1 file
+ 3
3
Compare changes
  • Side-by-side
  • Inline
+ 3
3
<?php
$aConfig = include('config_defaults.php');
if (file_exists('config_custom.php')){
if (file_exists(__DIR__.'/config_custom.php')){
$aConfig = array_replace_recursive(
$aConfig,
include('config_custom.php')
@@ -13,8 +13,8 @@ if (file_exists('config_custom.php')){
// ----------------------------------------------------------------------
$aConfig = array_merge($aConfig, [
'appRootDir' => dirname(dirname(__FILE__)),
'configDir' => dirname(__FILE__),
'appRootDir' => dirname(__DIR__),
'configDir' => __DIR__,
'dataDir' => $aConfig['workDir'] . '/data', // to write data: ssh keys, projects, database
'buildDir' => $aConfig['workDir'] . '/build',
'buildDefaultsDir' => $aConfig['workDir'] . '/defaults',
Loading