mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-15 06:00:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'limetech/master'

Browse Source
This commit is contained in:
bergware
2016-08-18 21:04:47 +02:00
parent e4d8c36983 bdbe2d7721
commit f82fdef257
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/dynamix.docker.manager/include/DockerClient.php
View File

@@ -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);

4
plugins/dynamix/DashboardApps.page
View File

@@ -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 "

4
plugins/dynamix/dynamix.plg
View File

@@ -3,8 +3,8 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "dynamix">
<!ENTITY author "Bergware">
<!ENTITY version "2016.07.27"> <!-- Intended new version of Dynamix webGUI -->
<!ENTITY unRAID "6.2.0-rc3"> <!-- Change to new unRAID version when issued together -->
<!ENTITY version "2016.08.18"> <!-- Intended new version of Dynamix webGUI -->
<!ENTITY unRAID "6.2.0-rc4"> <!-- Change to new unRAID version when issued together -->
<!ENTITY pluginURL "https://raw.github.com/limetech/&name;-6.2/master/plugins/&name;/&name;.plg">
]>