From 578e7d25c6ca484ea803281cd2aa8496fe8d535c Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 13 Jan 2019 16:55:02 +0100 Subject: [PATCH] Added docker default settings --- plugins/dynamix.docker.manager/include/DockerClient.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index b9dd92ed7..eb0c7d2f8 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -38,7 +38,8 @@ $driver = DockerUtil::driver(); // Docker configuration file - guaranteed to exist $docker_cfgfile = '/boot/config/docker.cfg'; -$dockercfg = parse_ini_file($docker_cfgfile); +$defaults = @parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg") ?: []; +$dockercfg = array_replace_recursive($defaults, parse_ini_file($docker_cfgfile)); function var_split($item, $i=0) { return explode(' ',$item)[$i];