diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php index 25a5757f2..34c7a716d 100644 --- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php @@ -924,7 +924,8 @@ class DockerClient { $c['BaseImage'] = $ct['Labels']['BASEIMAGE'] ?? false; $c['Icon'] = $info['Config']['Labels']['net.unraid.docker.icon'] ?? false; $c['Url'] = $info['Config']['Labels']['net.unraid.docker.webui'] ?? false; - $c['Shell'] = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false; + $c['Shell'] = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false; + $c['Manager'] = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false; $c['Ports'] = []; $c['Networks'] = []; if ($id) $c['NetworkMode'] = $net.str_replace('/',':',DockerUtil::ctMap($id)?:'/???'); @@ -950,7 +951,7 @@ class DockerClient { $ports = (isset($ports) && is_array($ports)) ? $ports : []; foreach ($ports as $port => $value) { [$PrivatePort, $Type] = array_pad(explode('/', $port),2,''); - $c['Ports'][$PrivatePort] = ['IP' => $ip, 'PrivatePort' => $PrivatePort, 'PublicPort' => $nat ? $value[0]['HostPort'] : $PrivatePort, 'NAT' => $nat, 'Type' => $Type]; + $c['Ports'][$PrivatePort] = ['IP' => $ip, 'PrivatePort' => $PrivatePort, 'PublicPort' => $nat ? $value[0]['HostPort'] : null, 'NAT' => $nat, 'Type' => $Type]; } ksort($c['Ports']); $this::$containersCache[] = $c; diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php index b36a0c0eb..7fc16a22a 100644 --- a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -93,7 +93,9 @@ foreach ($containers as $ct) { } $ports = []; foreach ($ct['Ports'] as $port) { - $ports[] = sprintf('%s:%s%s', _var($port,'PrivatePort'), strtoupper(_var($port,'Type')), _var($port,'PublicPort')); + $arrow_style = _var($port,'PublicPort') ? "\"fa fa-arrows-h\"" : ""; + $ports[] = sprintf('%s:%s%s', _var($port,'PrivatePort'), strtoupper(_var($port,'Type')),$arrow_style , _var($port,'PublicPort')); + } $paths = []; $ct['Volumes'] = is_array($ct['Volumes']) ? $ct['Volumes'] : [];