mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-22 18:19:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

DockerClient: sort container names alphabetically and port numbers numerically

Browse Source
This commit is contained in:
bergware
2018-03-26 13:33:39 +02:00
parent 8229bc8020
commit 8e59dca50b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/include/CreateDocker.php
+6 -4
View File
@@ -484,13 +484,15 @@ function getAllocations() {
$names = $docker = $ports = [];
docker("ps --format='{{.Names}}'", $names);
docker("inspect --format='{{.HostConfig.NetworkMode}}#{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}#{{range \$c := .HostConfig.PortBindings}}{{(index \$c 0).HostPort}}|{{end}}#{{range \$p,\$c := .Config.ExposedPorts}}{{\$p}}|{{end}}' ".implode(' ',$names),$docker); $n = 0;
natcasesort($names);
foreach ($names as $name) {
$list = [];
$list['Name'] = $name;
[$mode,$ip,$port1,$port2] = explode('#',$docker[$n++]);
$port = explode('|',$port1);
if (count($port)<2) $port = explode('|',str_replace(['/tcp','/udp'],'',$port2));
$list['Port'] = (strstr('host,bridge',$mode) ? $eth0['IPADDR:0'] : $ip).' : '.(implode(' ',array_unique($port,SORT_NUMERIC)) ?: '???')." -- $mode";
sort($port);
$list['Port'] = (strstr('host,bridge',$mode) ? $eth0['IPADDR:0'] : $ip).' : '.(implode(' ',array_unique($port)) ?: '???')." -- $mode";
$ports[] = $list;
}
return $ports;
@@ -801,9 +803,9 @@ optgroup.title{background-color:#625D5D;color:#FFFFFF;text-align:center;margin-t
function makeAllocations(container,current) {
var html = [];
for (var i=0; i < container.length; i++) {
var highlight = container[i].Name.toLowerCase()==current.toLowerCase() ? "font-weight:bold" : "";
html.push($("#templateAllocations").html().format(highlight,container[i].Name,container[i].Port));
for (var i=0,ct; ct=container[i]; i++) {
var highlight = ct.Name.toLowerCase()==current.toLowerCase() ? "font-weight:bold" : "";
html.push($("#templateAllocations").html().format(highlight,ct.Name,ct.Port));
}
return html.join('');
}