From 699d6591e8982928afcf06e9da9080bca3f16a77 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 2 Apr 2018 14:18:20 +0200 Subject: [PATCH] Fixed orphan images not shown when no containers defined --- plugins/dynamix.docker.manager/include/DockerContainers.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index 24000f95b..039326397 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -18,9 +18,10 @@ require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php"; $DockerClient = new DockerClient(); $DockerTemplates = new DockerTemplates(); $containers = $DockerClient->getDockerContainers(); +$images = $DockerClient->getDockerImages(); $user_prefs = $dockerManPaths['user-prefs']; -if (!$containers) { +if (!$containers && !$images) { echo "No Docker containers installed"; return; } @@ -103,7 +104,7 @@ foreach ($containers as $ct) { echo htmlspecialchars(str_replace('Up','Uptime',$ct['Status']))."
Created ".htmlspecialchars($ct['Created'])."
"; echo " "; } -foreach ($DockerClient->getDockerImages() as $image) { +foreach ($images as $image) { if (count($image['usedBy'])) continue; $id = $image['Id']; $menu[] = sprintf("addDockerImageContext('%s','%s');", $id, implode(',',$image['Tags']));