From 3c273be4bf6813a12ac602d4e55f8d5088a680c5 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Wed, 10 Aug 2016 15:54:22 -0500 Subject: [PATCH 1/3] Purge Docker icon after container removal (also helps reload outdated icons) --- .../include/DockerClient.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index d3e6682fa..e4cdbef00 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -778,7 +778,19 @@ class DockerClient { global $dockerManPaths; // Purge cached container information $info = DockerUtil::loadJSON($dockerManPaths['webui-info']); - if (isset($info[$id])) unset($info[$id]); + if (isset($info[$id])) { + if (isset($info[$id]['icon'])) { + $iconRam = '/usr/local/emhttp'.$info[$id]['icon']; + $iconFlash = str_replace($dockerManPaths['images-ram'], $dockerManPaths['images-storage'], $iconRam); + if (is_file($iconRam)) { + unlink($iconRam); + } + if (is_file($iconFlash)) { + unlink($iconFlash); + } + } + unset($info[$id]); + } DockerUtil::saveJSON($dockerManPaths['webui-info'], $info); // Attempt to remove container $this->getDockerJSON("/containers/${id}?force=1", "DELETE", $code); From be1941f83c2b5f72775770c96ff450aedc814a9c Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Wed, 10 Aug 2016 16:03:07 -0500 Subject: [PATCH 2/3] Fixed: Invalid Docker placeholder icon on Dashboard page --- plugins/dynamix/DashboardApps.page | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/DashboardApps.page b/plugins/dynamix/DashboardApps.page index 7255960c8..b2bf3e271 100644 --- a/plugins/dynamix/DashboardApps.page +++ b/plugins/dynamix/DashboardApps.page @@ -82,8 +82,8 @@ foreach ($allContainers as $ct) { $status = ($ct["Running"]) ? "started" : "stopped"; $Icon = $info['icon']; - if ( $Icon == "#" ){ - $Icon = "/plugins/dynamix.docker.manager/assets/images/question.png"; + if (!$Icon) { + $Icon = "/plugins/dynamix.docker.manager/images/question.png"; } print " From bdbe2d7721d6fc820db251ce0507a012b85ec0a3 Mon Sep 17 00:00:00 2001 From: Tom Mortensen Date: Thu, 18 Aug 2016 10:16:08 -0700 Subject: [PATCH 3/3] Version 2016.08.18 --- plugins/dynamix/dynamix.plg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/dynamix.plg b/plugins/dynamix/dynamix.plg index cd2cacf95..f7f132a49 100644 --- a/plugins/dynamix/dynamix.plg +++ b/plugins/dynamix/dynamix.plg @@ -3,8 +3,8 @@ - - + + ]>