mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 02:31:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Docker: improved processing of custom network types

Browse Source
This commit is contained in:
bergware
2018-04-14 13:06:42 +02:00
parent 91de1feaed
commit d73897a10e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/include/CreateDocker.php
+11 -7
View File
@@ -31,7 +31,13 @@ $DockerTemplates = new DockerTemplates();
$custom = array_merge(DockerUtil::docker("network ls --filter driver='bridge' --format='{{.Name}}'|grep -v '^bridge$'",true),DockerUtil::docker("network ls --filter driver='macvlan' --format='{{.Name}}'",true));
$subnet = ['bridge'=>'', 'host'=>'', 'none'=>''];
$driver = [];
foreach ($custom as $network) $subnet[$network] = substr(DockerUtil::docker("network inspect --format='{{range .IPAM.Config}}{{.Subnet}}, {{end}}' $network"),0,-1);
foreach (DockerUtil::docker("network ls --format='{{.Name}}|{{.Driver}}'",true) as $network) {
list($name,$type) = explode('|',$network);
$driver[$name] = $type;
}
function stopContainer($name) {
global $DockerClient;
@@ -366,8 +372,7 @@ function xmlSecurity(&$template) {
}
function xmlToCommand($xml, $create_paths=false) {
global $var;
global $docroot;
global $docroot, $var, $driver;
$xml = xmlToVar($xml);
$cmdName = strlen($xml['Name']) ? '--name='.escapeshellarg($xml['Name']) : '';
$cmdPrivileged = strtolower($xml['Privileged'])=='true' ? '--privileged=true' : '';
@@ -396,16 +401,15 @@ function xmlToCommand($xml, $create_paths=false) {
@chgrp($hostConfig, 100);
}
} elseif ($confType == 'port') {
$net = strtolower($xml['Network']);
$type = $driver[$xml['Network']];
// Export ports as variable if network is set to host or macvlan
if (preg_match('/^(host|eth[0-9]|br[0-9]|bond[0-9])/',$net) || strpos($net,'bridge')!==false) {
if ($type=='host' || $type=='macvlan') {
$Variables[] = strtoupper(escapeshellarg($Mode.'_PORT_'.$containerConfig).'='.escapeshellarg($hostConfig));
// No export of ports if network is set to none
} elseif ($net == 'none') {
} elseif ($type == 'bridge') {
// Export ports as port if network is set to (custom) bridge
} else {
$Ports[] = escapeshellarg($hostConfig.':'.$containerConfig.'/'.$Mode);
}
// No export of ports if network is set to none
} elseif ($confType == "variable") {
$Variables[] = escapeshellarg($containerConfig).'='.escapeshellarg($hostConfig);
} elseif ($confType == "device") {