diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index 5ed2309dc..9a9f14224 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -4,44 +4,26 @@ Tag="cubes"
Cond="(pgrep('dockerd')!==false)"
Markdown="false"
---
-
-
+
+
-
+
-
-
- | |
- Application |
- Version |
- Network |
- Port Mappings (App to Host) |
- Volume Mappings (App to Host) |
- Autostart |
- Log |
-
-
-
- getDockerContainers();
- if (!$all_containers) {
- $all_containers = [];
- echo " | No Docker Containers Installed |
";
- }
- $info = $DockerTemplates->getAllInfo();
- $contextMenus = [];
-
- $IP = $eth0['IPADDR:0'];
- foreach ($all_containers as $ct) {
- $name = $ct['Name'];
- $mode = $ct['NetworkMode'];
- $is_autostart = ($info[$name]['autostart']) ? 'true' : 'false';
- $updateStatus = $info[$name]['updated'];
- $updateStatus = ($updateStatus == "true" || $updateStatus == "undef") ? 'true' : 'false';
- $running = ($ct['Running']) ? 'true' : 'false';
- $webGuiUrl = $info[$name]['url'];
- $Support = $ct['Support'];
- $Project = $ct['Project'];
-
- $contextMenus[] = sprintf("addDockerContainerContext('%s', '%s', '%s', %s, %s, %s, '%s', '%s', '%s', '%s');", addslashes($name), addslashes($ct['ImageId']), addslashes($info[$name]['template']), $running, $updateStatus, $is_autostart, addslashes(html_entity_decode($webGuiUrl)), $ct["Id"], addslashes(html_entity_decode($info[$name]['Support'])),addslashes(html_entity_decode($info[$name]['Project'])));
- $shape = ($ct["Running"]) ? "play" : "square";
- $status = ($ct["Running"]) ? "started" : "stopped";
-
- $Icon = $info[$name]['icon'];
- if (!$Icon) {
- $Icon = "/plugins/dynamix.docker.manager/images/question.png";
- }
-
- $ports = [];
- if ($mode == 'bridge') {
- $binds = explode('|',exec("docker inspect --format='{{range \$p,\$c := .HostConfig.PortBindings}}{{\$p}}:{{(index \$c 0).HostPort}}|{{end}}' $name 2>/dev/null"));
- $ip = exec("docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $name 2>/dev/null");
- foreach ($binds as $bind) {
- if (!$bind) continue;
- list($container_port,$host_port) = explode(':',$bind);
- $ports[] = sprintf('%s:%s%s:%s', $ip, $container_port, $IP, $host_port);
- }
- } else {
- $binds = explode('|',exec("docker inspect --format='{{range \$p,\$c := .Config.ExposedPorts}}{{\$p}}|{{end}}' $name 2>/dev/null"));
- $ip = exec("docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $name 2>/dev/null") ?: $IP;
- foreach ($binds as $bind) {
- if (!$bind) continue;
- $ports[] = sprintf('%s:%s%s:%s', $ip, $bind, $ip, str_replace(['/tcp','/udp'],'',$bind));
- }
- }
-
- $paths = [];
- $mounts = explode('|',exec("docker inspect --format='{{range \$c := .HostConfig.Binds}}{{\$c}}|{{end}}' $name 2>/dev/null"));
- foreach ($mounts as $mount) {
- if (!$mount) continue;
- list($host_path,$container_path,$access_mode) = explode(':',$mount);
- $paths[] = sprintf('%s%s', htmlspecialchars($container_path), $access_mode=='ro'?'long-arrow-left':'arrows-h', htmlspecialchars($host_path));
- }
- ?>
-
-
-
-
- ![](\"".htmlspecialchars($Icon)."\")
-
- |
-
-
-
-
-
-
- Container ID:
-
-
-
-
- |
-
- update ready";
- } elseif ($updateStatus == "true") {
- echo " up-to-date";
- echo "";
- } else {
- echo " not available";
- echo "";
- }
- ?>
- |
- |
- ", $ports)?> |
- ", $paths)?> |
- > |
-  Created |
-
-
-
-
- getDockerImages() as $image) {
- if (count($image['usedBy'])) {
- continue;
- }
-
- $contextMenus[] = sprintf("addDockerImageContext('%s', '%s');", $image['Id'], implode(', ', $image['Tags']));
-
- ?>
-
-
-
-
- ![](\"/webGui/images/disk.png\")
- |
-
- (orphan image)
- Image ID:
-
- ", array_map('htmlspecialchars',$image['Tags']))?>
-
- |
- |
- |
- |
- |
- Created |
-
-
-
+ | Application | Version | Network | Port Mappings (App to Host) | Volume Mappings (App to Host) | Autostart | Log |
|---|
+| Please wait... retrieving container information |
@@ -232,48 +59,34 @@ function resize(bind) {
}
}
-$(function() {
- if ($.cookie('docker_listview_mode') == 'advanced') {
- $('.advanced').show();
- $('.basic').hide();
- }
-
- $('.autostart').switchButton({
- labels_placement: "right"
- });
- $('.autostart').change(function () {
- $.post( "/plugins/dynamix.docker.manager/include/UpdateConfig.php", { action: "autostart", container: $(this).attr('container'), response: "json" }, function( data ) {
- $(this).prop('checked', data.autostart );
- }, "json");
- });
-
- $('.advancedview').switchButton({
- labels_placement: "left",
- on_label: 'Advanced View',
- off_label: 'Basic View',
- checked: $.cookie('docker_listview_mode') == 'advanced'
- });
- $('.advancedview').change(function () {
- $('.advanced').toggle('slow');
- $('.basic').toggle('slow');
- $.cookie('docker_listview_mode', $('.advancedview').is(':checked') ? 'advanced' : 'basic', { expires: 3650 });
- });
-
+function loadlist() {
+ $.get('/plugins/dynamix.docker.manager/include/DockerContainers.php',function(d) {
+ var data = d.split(/\0/);
+ $('#docker_list').html(data[0]);
+ $('head').append('
diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php
new file mode 100644
index 000000000..ef0b85b34
--- /dev/null
+++ b/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -0,0 +1,126 @@
+
+getDockerContainers();
+if (!$all_containers) {
+ echo "| No Docker containers installed |
";
+ return;
+}
+
+// Read network settings
+extract(parse_ini_file('state/network.ini',true));
+
+// Read container info
+$all = $DockerTemplates->getAllInfo();
+$menu = [];
+
+foreach ($all_containers as $ct) {
+ $name = $ct['Name'];
+ $info = &$all[$name];
+ $mode = $ct['NetworkMode'];
+ $id = $ct['Id'];
+ $imageID = $ct['ImageId'];
+ $is_autostart = $info['autostart'] ? 'true':'false';
+ $updateStatus = $info['updated']=='true'||$info['updated']=='undef' ? 'true':'false';
+ $running = $ct['Running'] ? 'true':'false';
+ $template = $info['template'];
+ $webGui = html_entity_decode($info['url']);
+ $support = html_entity_decode($info['Support']);
+ $project = html_entity_decode($info['Project']);
+ $menu[] = sprintf("addDockerContainerContext('%s','%s','%s',%s,%s,%s,'%s','%s','%s','%s');",addslashes($name),addslashes($imageID),addslashes($template),$running,$updateStatus,$is_autostart,addslashes($webGui),$id,addslashes($support),addslashes($project));
+ $shape = $ct['Running'] ? 'play':'square';
+ $status = $ct['Running'] ? 'started':'stopped';
+ $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png';
+ $ports = [];
+ if ($mode=='bridge') {
+ $binds = explode('|',exec("docker inspect --format='{{range \$p,\$c := .HostConfig.PortBindings}}{{\$p}}:{{(index \$c 0).HostPort}}|{{end}}' $name 2>/dev/null"));
+ $ip = exec("docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $name 2>/dev/null");
+ foreach ($binds as $bind) {
+ if (!$bind) continue;
+ list($container_port,$host_port) = explode(':',$bind);
+ $ports[] = sprintf('%s:%s%s:%s',$ip, $container_port, $eth0['IPADDR:0'], $host_port);
+ }
+ } else {
+ $binds = explode('|',exec("docker inspect --format='{{range \$p,\$c := .Config.ExposedPorts}}{{\$p}}|{{end}}' $name 2>/dev/null"));
+ $ip = exec("docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $name 2>/dev/null") ?: $eth0['IPADDR:0'];
+ foreach ($binds as $bind) {
+ if (!$bind) continue;
+ $ports[] = sprintf('%s:%s%s:%s',$ip, $bind, $ip, str_replace(['/tcp','/udp'],'',$bind));
+ }
+ }
+ $paths = [];
+ $mounts = explode('|',exec("docker inspect --format='{{range \$c := .HostConfig.Binds}}{{\$c}}|{{end}}' $name 2>/dev/null"));
+ foreach ($mounts as $mount) {
+ if (!$mount) continue;
+ list($host_path,$container_path,$access_mode) = explode(':',$mount);
+ $paths[] = sprintf('%s%s', htmlspecialchars($container_path), $access_mode=='ro'?'long-arrow-left':'arrows-h', htmlspecialchars($host_path));
+ }
+ echo "";
+ echo "";
+ echo " ![](\"".htmlspecialchars($icon)."\") ";
+ echo " | ";
+ if ($template) {
+ echo "".htmlspecialchars($name)."";
+ } else {
+ echo htmlspecialchars($name);
+ }
+ echo " Container ID: ".htmlspecialchars($id)." ";
+ if ($ct['BaseImage']) echo "".htmlspecialchars(${ct['BaseImage']})." ";
+ echo " | ";
+ if ($updateStatus=='false') {
+ echo " update ready";
+ } elseif ($updateStatus=='true') {
+ echo " up-to-date";
+ echo "";
+ } else {
+ echo " not available";
+ echo "";
+ }
+ echo " | $mode | ";
+ echo "".implode('
',$ports)." | ";
+ echo "".implode('
',$paths)." | ";
+ echo " | ";
+ echo "".htmlspecialchars(str_replace('Up','Uptime',$ct['Status']))." Created ".htmlspecialchars($ct['Created'])." |
";
+}
+foreach ($DockerClient->getDockerImages() as $image) {
+ if (count($image['usedBy'])) continue;
+ $menu[] = sprintf("addDockerImageContext('%s','%s');",$image['Id'],implode(', ',$image['Tags']));
+ echo "";
+ echo "";
+ echo " ";
+ echo "  ";
+ echo " | ";
+ echo "(orphan image) Image ID: ".htmlspecialchars($image['Id'])." ";
+ if (strpos(implode($image['Tags']),"<none>:<none>")===false) echo "".implode('
',array_map('htmlspecialchars',$image['Tags']))." ";
+ echo " | | | | | ";
+ echo "Created ".htmlspecialchars($image['Created'])." |
";
+}
+echo "\0".implode($menu);
+?>
diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js
index 01661d0ec..b7af0bddf 100644
--- a/plugins/dynamix.docker.manager/javascript/docker.js
+++ b/plugins/dynamix.docker.manager/javascript/docker.js
@@ -1,43 +1,43 @@
var eventURL = "/plugins/dynamix.docker.manager/include/Events.php";
function addDockerContainerContext(container, image, template, started, update, autostart, webui, id, Support, Project) {
- var opts = [{header: container, image: "/plugins/dynamix.docker.manager/images/dynamix.docker.manager.png"}];
+ var opts = [{header:container, image:"/plugins/dynamix.docker.manager/images/dynamix.docker.manager.png"}];
if (started && (webui !== "" && webui != "#")) {
- opts.push({text: 'WebUI', icon: 'fa-globe', href: webui, target: '_blank'});
- opts.push({divider: true});
+ opts.push({text:'WebUI', icon:'fa-globe', href:webui, target:'_blank'});
+ opts.push({divider:true});
}
if (!update) {
- opts.push({text: 'Update', icon: 'fa-arrow-down', action: function(e){ e.preventDefault(); execUpContainer(container); }});
- opts.push({divider: true});
+ opts.push({text:'Update', icon:'fa-arrow-down', action:function(e){e.preventDefault(); execUpContainer(container);}});
+ opts.push({divider:true});
}
if (started) {
- opts.push({text: 'Stop', icon: 'fa-stop', action: function(e){ e.preventDefault(); eventControl({action: "stop", container: id}); }});
- opts.push({text: 'Restart', icon: 'fa-refresh', action: function(e){ e.preventDefault(); eventControl({action: "restart", container: id}); }});
+ opts.push({text:'Stop', icon:'fa-stop', action:function(e){e.preventDefault(); eventControl({action:"stop", container:id}, 'loadlist');}});
+ opts.push({text:'Restart', icon:'fa-refresh', action:function(e){e.preventDefault(); eventControl({action:"restart", container:id});}});
} else {
- opts.push({text: 'Start', icon: 'fa-play', action: function(e){ e.preventDefault(); eventControl({action: "start", container: id}); }});
+ opts.push({text:'Start', icon:'fa-play', action:function(e){e.preventDefault(); eventControl({action:"start", container:id}, 'loadlist');}});
}
- opts.push({divider: true});
+ opts.push({divider:true});
if (location.pathname.indexOf("/Dashboard") === 0) {
- opts.push({text: 'Logs', icon: 'fa-navicon', action: function(e){ e.preventDefault(); containerLogs(container, id); }});
+ opts.push({text:'Logs', icon:'fa-navicon', action:function(e){e.preventDefault(); containerLogs(container, id);}});
}
if (template) {
- opts.push({text: 'Edit', icon: 'fa-wrench', action: function(e){ e.preventDefault(); editContainer(container, template); }});
+ opts.push({text:'Edit', icon:'fa-wrench', action:function(e){e.preventDefault(); editContainer(container, template);}});
}
- opts.push({divider: true});
- opts.push({text: 'Remove', icon: 'fa-trash', action: function(e){ e.preventDefault(); rmContainer(container, image, id); }});
- if (Support) {
- opts.push({divider: true});
- opts.push({text: 'Support', icon: 'fa-question', href: Support, target: '_blank'});
- }
- if (Project) {
- opts.push({text: 'Project Page', icon: 'fa-life-ring', href: Project, target: '_blank'});
- }
- context.attach('#context-'+container, opts);
+ opts.push({divider:true});
+ opts.push({text:'Remove', icon:'fa-trash', action:function(e){e.preventDefault(); rmContainer(container, image, id);}});
+ if (Support) {
+ opts.push({divider:true});
+ opts.push({text:'Support', icon:'fa-question', href:Support, target:'_blank'});
+ }
+ if (Project) {
+ opts.push({text:'Project Page', icon:'fa-life-ring', href:Project, target:'_blank'});
+ }
+ context.attach('#'+id, opts);
}
function addDockerImageContext(image, imageTag) {
- var opts = [{header: '(orphan image)'}];
- opts.push({text: "Remove", icon: "fa-trash", action: function(e){ e.preventDefault(); rmImage(image, imageTag); }});
+ var opts = [{header:'(orphan image)'}];
+ opts.push({text:"Remove", icon:"fa-trash", action:function(e){e.preventDefault(); rmImage(image, imageTag);}});
context.attach('#context-'+image, opts);
}
@@ -52,19 +52,19 @@ function popupWithIframe(title, cmd, reload) {
$("#iframe-popup").html('');
$("#iframe-popup").dialog({
- autoOpen: true,
- title: title,
- draggable: true,
- width: 800,
- height: ((screen.height / 5) * 4) || 0,
- resizable: true,
- modal: true,
- show: {effect: "fade", duration: 250},
- hide: {effect: "fade", duration: 250},
- open: function(ev, ui) {
+ autoOpen:true,
+ title:title,
+ draggable:true,
+ width:800,
+ height:((screen.height / 5) * 4) || 0,
+ resizable:true,
+ modal:true,
+ show:{effect:"fade", duration:250},
+ hide:{effect:"fade", duration:250},
+ open:function(ev, ui) {
$("#myIframe").attr("src", cmd);
},
- close: function(event, ui) {
+ close:function(event, ui) {
if (reload && !$("#myIframe").contents().find("#canvas").length) {
location = window.location.href;
} else {
@@ -75,7 +75,7 @@ function popupWithIframe(title, cmd, reload) {
$(".ui-dialog .ui-dialog-titlebar").addClass("menu");
$(".ui-dialog .ui-dialog-title").css("text-align", "center").css("width", "100%");
$(".ui-dialog .ui-dialog-content").css("padding", "0");
- //$('.ui-widget-overlay').click(function() { $("#iframe-popup").dialog("close"); });
+//$('.ui-widget-overlay').click(function() {$("#iframe-popup").dialog("close");});
}
function addContainer() {
@@ -98,35 +98,35 @@ function updateContainer(container) {
var body = "Update container: "+container;
swal({
- title: "Are you sure?",
- text: body,
- type: "warning",
- showCancelButton: true,
- confirmButtonColor: "#8CD4F5",
- confirmButtonText: "Yes, update it!"
+ title:"Are you sure?",
+ text:body,
+ type:"warning",
+ showCancelButton:true,
+ confirmButtonColor:"#8CD4F5",
+ confirmButtonText:"Yes, update it!"
}, function() {
execUpContainer(container);
});
}
function rmContainer(container, image, id) {
- var body = "Remove container: "+container+"
";
+ var body = "Remove container: "+container+"
";
swal({
- title: "Are you sure?",
- text: body,
- type: "warning",
- html: true,
- showCancelButton: true,
- confirmButtonColor: "#DD6B55",
- confirmButtonText: "Yes, delete it!",
- closeOnConfirm: false,
- showLoaderOnConfirm: true
+ title:"Are you sure?",
+ text:body,
+ type:"warning",
+ html:true,
+ showCancelButton:true,
+ confirmButtonColor:"#DD6B55",
+ confirmButtonText:"Yes, delete it!",
+ closeOnConfirm:false,
+ showLoaderOnConfirm:true
}, function() {
if ($("#removeimagechk").prop('checked')) {
- eventControl({action: "remove_all", container: id, image: image});
+ eventControl({action:"remove_all", container:id, image:image});
} else {
- eventControl({action: "remove_container", container: id});
+ eventControl({action:"remove_container", container:id});
}
});
}
@@ -135,26 +135,27 @@ function rmImage(image, imageName) {
var body = "Remove image: "+$('').html(imageName).text();
swal({
- title: "Are you sure?",
- text: body,
- type: "warning",
- showCancelButton: true,
- confirmButtonColor: "#DD6B55",
- confirmButtonText: "Yes, delete it!",
- closeOnConfirm: false,
- showLoaderOnConfirm: true
+ title:"Are you sure?",
+ text:body,
+ type:"warning",
+ showCancelButton:true,
+ confirmButtonColor:"#DD6B55",
+ confirmButtonText:"Yes, delete it!",
+ closeOnConfirm:false,
+ showLoaderOnConfirm:true
}, function() {
- eventControl({action: "remove_image", image: image});
+ eventControl({action:"remove_image", image:image});
});
}
function eventControl(params, reload) {
- if (typeof reload == "undefined") reload = true;
+ var spin = typeof reload != 'undefined';
+ if (spin) $('#'+params['container']).addClass('fa-spin');
$.post(eventURL, params, function(data) {
if (data.success === true) {
- if (reload) location.reload();
+ if (spin) setTimeout(reload+'()',500); else location=window.location.href;
} else {
- swal({title: "Execution error", text: data.success, type: "error"});
+ swal({title:"Execution error", text:data.success, type:"error"});
}
}, "json");
}
@@ -175,10 +176,9 @@ function autoStart(container, event) {
function containerLogs(container, id) {
var height = 600;
var width = 900;
- var run = eventURL + "?action=log&container=" + id + "&title=Log for: " + container;
+ var run = eventURL + "?action=log&container=" + id + "&title=Log for:" + container;
var top = (screen.height-height) / 2;
var left = (screen.width-width) / 2;
var options = 'resizeable=yes,scrollbars=yes,height='+height+',width='+width+',top='+top+',left='+left;
window.open(run, 'log', options);
}
-
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 09cbba4ff..521e39d04 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -5,8 +5,9 @@ Cond="(pgrep('libvirtd')!==false)"
Markdown="false"
---
+";
+ foreach ($cpus as $pair) {
+ unset($cpu1,$cpu2);
+ list($cpu1, $cpu2) = preg_split('/[,-]/',$pair);
+ $check = in_array($cpu1, $vm['domain']['vcpu']) ? 'fa-check-square-o':'fa-square-o';
+ if (!$cpu2) {
+ echo "";
+ } else {
+ echo "";
+ $check = in_array($cpu2, $vm['domain']['vcpu']) ? 'fa-check-square-o':'fa-square-o';
+ echo "";
+ }
+ }
+ echo "";
+}
+$uuid = $_GET['uuid'];
+$subaction = $_GET['subaction'] ?? '';
+if ($_GET['refresh']) {
+ $vm = $_GET['name'];
+ if ($lv->domain_is_active($vm)) {
+ echo "";
+ $msg = "Waiting for $vm to shutdown...";
+ } else {
+ echo "";
+ $msg = "$vm has been shutdown";
+ }
+}
+if ($subaction) {
+ $vm = $lv->domain_get_name_by_uuid($uuid);
+ if ($subaction == 'disk-resize') {
+ $capacity = str_replace(["KB","MB","GB","TB","PB", " ", ","], ["K","M","G","T","P", "", ""], strtoupper($_POST['cap']));
+ $oldcap = str_replace(["KB","MB","GB","TB","PB", " ", ","], ["K","M","G","T","P", "", ""], strtoupper($_GET['oldcap']));
+ if (substr($oldcap,0,-1) < substr($capacity,0,-1)){
+ shell_exec("qemu-img resize -q ".escapeshellarg($_GET['disk'])." ".escapeshellarg($capacity));
+ $msg = $vm." disk capacity has been changed to $capacity";
+ } else {
+ $msg = "Error: disk capacity has to be greater than {$_GET['oldcap']}";
+ }
+ } elseif ($subaction == 'disk-remove') {
+ $msg = $lv->domain_disk_remove($vm, $_GET['dev'])
+ ? "$vm disk has been removed"
+ : "Error: ".$lv->get_last_error();
+ } elseif ($subaction == 'snap-create') {
+ $msg = $lv->domain_snapshot_create($vm)
+ ? "Snapshot for $vm has been created"
+ : "Error: ".$lv->get_last_error();
+ } elseif ($subaction == 'snap-delete') {
+ $msg = $lv->domain_snapshot_delete($vm, $_GET['snap'])
+ ? "Snapshot for $vm has been deleted"
+ : "Error: ".$lv->get_last_error();
+ } elseif ($subaction == 'snap-revert') {
+ $msg = $lv->domain_snapshot_revert($vm, $_GET['snap'])
+ ? "$vm has been reverted"
+ : "Error: ".$lv->get_last_error();
+ } elseif ($subaction == 'snap-desc') {
+ $msg = $lv->snapshot_set_metadata($vm, $_GET['snap'], $_POST['snapdesc'])
+ ? "Snapshot description for $vm has been saved"
+ : "Error: ".$lv->get_last_error();
+ }
+ echo "";
+}
+if ($libvirt_running=='yes') {
+ $vms = $lv->get_domains() ?: [];
+ sort($vms);
+}
+if (empty($vms)) {
+ $msg = $libvirt_running=='yes'
+ ? 'No VMs defined. Create from template or add XML.'
+ : 'Libvirt is not running. Goto Settings tab then click Start.';
+}
+?>
@@ -31,394 +111,14 @@ div.Panel{float:unset;margin:4px;height:inherit;border:none;}
div.Panel:hover{background-color:unset;}
div.PanelText{display:none;}
-";
- foreach ($cpus as $pair) {
- unset($cpu1,$cpu2);
- list($cpu1, $cpu2) = preg_split('/[,-]/',$pair);
- $check = in_array($cpu1, $arrConfig['domain']['vcpu']) ? 'fa-check-square-o' : 'fa-square-o';
- if (!$cpu2) {
- echo "";
- } else {
- echo "";
- $check = in_array($cpu2, $arrConfig['domain']['vcpu']) ? 'fa-check-square-o' : 'fa-square-o';
- echo "";
- }
- }
- echo "";
-}
-$subaction = array_key_exists('subaction', $_GET) ? $_GET['subaction'] : '';
-$uuid = $_GET['uuid'];
-if ($_GET['refresh']) {
- $name = $_GET['name'];
- if ($lv->domain_is_active($name)) {
- echo "";
- $msg = "Waiting for $name to shutdown...";
- } else {
- echo "";
- $msg = "$name has been shutdown";
- }
-}
-if ($subaction) {
- $domName = $lv->domain_get_name_by_uuid($uuid);
- if ($subaction == 'disk-resize') {
- $capacity = str_replace(["KB","MB","GB","TB","PB", " ", ","], ["K","M","G","T","P", "", ""], strtoupper($_POST['cap']));
- $oldcap = str_replace(["KB","MB","GB","TB","PB", " ", ","], ["K","M","G","T","P", "", ""], strtoupper($_GET['oldcap']));
- if (substr($oldcap,0,-1) < substr($capacity,0,-1)){
- shell_exec("qemu-img resize -q ".escapeshellarg($_GET['disk'])." ".escapeshellarg($capacity));
- $msg = $domName." disk capacity has been changed to $capacity";
- }else {
- $msg = "Error: disk capacity has to be greater than {$_GET['oldcap']}";
- }
- }
- elseif ($subaction == 'disk-remove') {
- $msg = $lv->domain_disk_remove($domName, $_GET['dev']) ?
- "$domName disk has been removed" :
- 'Error: '.$lv->get_last_error();
- }
- elseif ($subaction == 'snap-create') {
- $msg = $lv->domain_snapshot_create($domName) ?
- "Snapshot for $domName has been created" :
- 'Error: '.$lv->get_last_error();
- }
- elseif ($subaction == 'snap-delete') {
- $msg = $lv->domain_snapshot_delete($domName, $_GET['snap']) ?
- "Snapshot for $domName has been deleted" :
- 'Error: '.$lv->get_last_error();
- }
- elseif ($subaction == 'snap-revert') {
- $msg = $lv->domain_snapshot_revert($domName, $_GET['snap']) ?
- "$domName has been reverted" :
- 'Error: '.$lv->get_last_error();
- }
- elseif ($subaction == 'snap-desc') {
- $msg = $lv->snapshot_set_metadata($domName, $_GET['snap'], $_POST['snapdesc']) ?
- "Snapshot description for $domName has been saved":
- 'Error: '.$lv->get_last_error();
- }
- echo "";
-}
-
-$contextMenus = [];
-
-//Get domain variables for each domain
-if ($libvirt_running == "yes") {
- $doms = $lv->get_domains();
- sort($doms);
-}
-
-echo '
-
-
-
-
-
-
-
-
-
-
-
-
- ';
-
-if (empty($doms)) {
- if ($libvirt_running == "yes") {
- echo ' | No Virtual Machines Installed |
';
- $msg = 'No VMs defined. Create from template or add XML.';
- } else {
- $msg = 'Libvirt is not running. Goto Settings tab then click Start.';
- }
-} else {
- for ($i = 0; $i < sizeof($doms); $i++) {
- $name = $doms[$i];
- $res = $lv->get_domain_by_name($name);
- $desc = $lv->domain_get_description($res);
- $uuid = $lv->domain_get_uuid($res);
- $dom = $lv->domain_get_info($res);
- $id = $lv->domain_get_id($res) ?: '-';
- $is_autostart = $lv->domain_get_autostart($res);
- $state = $lv->domain_state_translate($dom['state']);
- $vmicon = $lv->domain_get_icon_url($res);
- $arrConfig = domain_to_config($uuid);
- if ($state == 'running') {
- $mem = $dom['memory'] / 1024;
- }else{
- $mem = $lv->domain_get_memory($res) / 1024;
- }
- $mem = round($mem).'M';
- $vcpu = $dom['nrVirtCpu'];
- $auto = $is_autostart ? 'checked="checked"':"";
- $template = $lv->_get_single_xpath_result($res, '//domain/metadata/*[local-name()=\'vmtemplate\']/@name');
- if (empty($template)) {
- $template = 'Custom';
- }
- $log = (is_file('/var/log/libvirt/qemu/'.$name.'.log') ? 'libvirt/qemu/'.$name.'.log' : '');
-
- $disks = '-';
- $diskdesc = '';
- if (($diskcnt = $lv->get_disk_count($res)) > 0) {
- $disks = $diskcnt.' / '.$lv->get_disk_capacity($res);
- $diskdesc = 'Current physical size: '.$lv->get_disk_capacity($res, true);
- }
-
- $arrValidDiskBuses = getValidDiskBuses();
- $vncport = $lv->domain_get_vnc_port($res);
- $vnc = '';
- $graphics = '';
- if ($vncport > 0) {
- $wsport = $lv->domain_get_ws_port($res);
- $vnc = '/plugins/dynamix.vm.manager/vnc.html?autoconnect=true&host=' . $_SERVER['HTTP_HOST'] . '&port=&path=/wsproxy/' . $wsport . '/';
- $graphics = 'VNC:'.$vncport;
- }
- else if ($vncport == -1) {
- $graphics = 'VNC:auto';
- }
- else if (!empty($arrConfig['gpu'])) {
- $arrValidGPUDevices = getValidGPUDevices();
- foreach($arrConfig['gpu'] as $arrGPU) {
- foreach($arrValidGPUDevices as $arrDev) {
- if ($arrGPU['id'] == $arrDev['id']) {
- $graphics .= $arrDev['name']."\n";
- }
- }
- }
- $graphics = str_replace("\n", "
", trim($graphics));
- }
-
- unset($dom);
-
- $contextMenus[] = sprintf("addVMContext('%s', '%s', '%s', '%s', '%s', '%s');", addslashes($name), addslashes($uuid), addslashes($template), $state, addslashes($vnc), addslashes($log));
-
- //Domain information
- echo '
- | '.renderVMContentIcon($uuid, $name, $vmicon, $state).' |
- '.$name.' |
- '.$desc.' |
- '.$vcpu.' |
- '.$mem.' |
- '.$disks.' |
- '.$graphics.' |
- |
-
';
-
- /* Disk device information */
- echo '
-
-
-
-
-
-
-
-
-
-
-
- ';
-
- /* Display domain disks */
- foreach ($lv->get_disk_stats($res) as $arrDisk) {
- $capacity = $lv->format_size($arrDisk['capacity'], 0);
- $allocation = $lv->format_size($arrDisk['allocation'], 0);
- $disk = (array_key_exists('file', $arrDisk)) ? $arrDisk['file'] : $arrDisk['partition'];
- $dev = $arrDisk['device'];
- $bus = $arrDisk['bus'];
- echo '
- | '.$disk.' |
- '.$arrValidDiskBuses[$bus].' | ';
-
- if ($state == 'shutoff') {
- echo '
-
- |
- '.$allocation.' |
- detach
- | ';
- } else {
- echo ''.$capacity.' |
- '.$allocation.' |
- N/A | ';
- }
-
- echo ' ';
- }
- /* end Display domain disks */
-
- /* Display domain cdroms */
- foreach ($lv->get_cdrom_stats($res) as $arrCD) {
- $capacity = $lv->format_size($arrCD['capacity'], 0);
- $allocation = $lv->format_size($arrCD['allocation'], 0);
- $disk = (array_key_exists('file', $arrCD)) ? $arrCD['file'] : $arrCD['partition'];
- $dev = $arrCD['device'];
- $bus = $arrCD['bus'];
- echo '
- | '.$disk.' |
- '.$arrValidDiskBuses[$bus].' |
- '.$capacity.' |
- '.$allocation.' |
- ';
-
- if ($state == 'shutoff')
- echo 'detach ';
- else
- echo 'N/A';
-
- echo ' |
- ';
- }
- /* end Display domain cdroms */
-
- echo ' ';
-
- /* Backup information */
- /* echo "';*/
- /* End Backup information*/
-
- /* Snapshot information */
- /*
- echo "';
- */
- /* End Snapshot information */
-
- echo ' |
';
- }
-}
-echo '
';
-
-?>
-
+
+ | Name | Description | CPUs | Memory | vDisks | Graphics | Autostart |
|---|
+| Please wait... retrieving VM information |
+
-
-
+
+
diff --git a/plugins/dynamix.vm.manager/VMajax.php b/plugins/dynamix.vm.manager/VMajax.php
index d12dcaf5f..4938c862e 100644
--- a/plugins/dynamix.vm.manager/VMajax.php
+++ b/plugins/dynamix.vm.manager/VMajax.php
@@ -118,6 +118,11 @@ switch ($action) {
$arrResponse = $lv->domain_shutdown($domName) ?
['success' => true, 'state' => $lv->domain_get_state($domName)] :
['error' => $lv->get_last_error()];
+ $n = 10; // wait for VM to die
+ while ($arrResponse['success'] && $lv->domain_get_state($domName)=='running') {
+ sleep(1);
+ if(!--$n) break;
+ }
break;
case 'domain-destroy':
diff --git a/plugins/dynamix.vm.manager/classes/VMMachines.php b/plugins/dynamix.vm.manager/classes/VMMachines.php
new file mode 100644
index 000000000..92dcde770
--- /dev/null
+++ b/plugins/dynamix.vm.manager/classes/VMMachines.php
@@ -0,0 +1,135 @@
+
+get_domains() ?: [];
+sort($vms);
+if (empty($vms)) {
+ echo '| No Virtual Machines installed |
';
+ return;
+}
+$menu = []; $i = 0;
+foreach ($vms as $vm) {
+ $res = $lv->get_domain_by_name($vm);
+ $desc = $lv->domain_get_description($res);
+ $uuid = $lv->domain_get_uuid($res);
+ $dom = $lv->domain_get_info($res);
+ $id = $lv->domain_get_id($res) ?: '-';
+ $is_autostart = $lv->domain_get_autostart($res);
+ $state = $lv->domain_state_translate($dom['state']);
+ $vmicon = $lv->domain_get_icon_url($res);
+ $arrConfig = domain_to_config($uuid);
+ if ($state == 'running') {
+ $mem = $dom['memory'] / 1024;
+ } else {
+ $mem = $lv->domain_get_memory($res) / 1024;
+ }
+ $mem = round($mem).'M';
+ $vcpu = $dom['nrVirtCpu'];
+ $auto = $is_autostart ? 'checked':'';
+ $template = $lv->_get_single_xpath_result($res, '//domain/metadata/*[local-name()=\'vmtemplate\']/@name');
+ if (empty($template)) $template = 'Custom';
+ $log = (is_file("/var/log/libvirt/qemu/$vm.log") ? "libvirt/qemu/$vm.log" : '');
+ $disks = '-';
+ $diskdesc = '';
+ if (($diskcnt = $lv->get_disk_count($res)) > 0) {
+ $disks = $diskcnt.' / '.$lv->get_disk_capacity($res);
+ $diskdesc = 'Current physical size: '.$lv->get_disk_capacity($res, true);
+ }
+ $arrValidDiskBuses = getValidDiskBuses();
+ $vncport = $lv->domain_get_vnc_port($res);
+ $vnc = '';
+ $graphics = '';
+ if ($vncport > 0) {
+ $wsport = $lv->domain_get_ws_port($res);
+ $vnc = '/plugins/dynamix.vm.manager/vnc.html?autoconnect=true&host=' . $_SERVER['HTTP_HOST'] . '&port=&path=/wsproxy/' . $wsport . '/';
+ $graphics = 'VNC:'.$vncport;
+ } elseif ($vncport == -1) {
+ $graphics = 'VNC:auto';
+ } elseif (!empty($arrConfig['gpu'])) {
+ $arrValidGPUDevices = getValidGPUDevices();
+ foreach ($arrConfig['gpu'] as $arrGPU) foreach ($arrValidGPUDevices as $arrDev) {
+ if ($arrGPU['id'] == $arrDev['id']) $graphics .= $arrDev['name']."\n";
+ }
+ $graphics = str_replace("\n", "
", trim($graphics));
+ }
+ unset($dom);
+ $menu[] = sprintf("addVMContext('%s','%s','%s','%s','%s','%s');", addslashes($vm),addslashes($uuid),addslashes($template),$state,addslashes($vnc),addslashes($log));
+
+ /* VM information */
+ echo "";
+ echo "| ".renderVMContentIcon($uuid, $vm, $vmicon, $state)." | ";
+ echo "$vm | ";
+ echo "$desc | ";
+ echo "$vcpu | ";
+ echo "$mem | ";
+ echo "$disks | ";
+ echo "$graphics | ";
+ echo " |
";
+
+ /* Disk device information */
+ echo "";
+ echo "";
+ echo "";
+ echo "| Disk devices | Bus | Capacity | Allocation | Actions |
|---|
";
+ echo "";
+
+ /* Display VM disks */
+ foreach ($lv->get_disk_stats($res) as $arrDisk) {
+ $capacity = $lv->format_size($arrDisk['capacity'], 0);
+ $allocation = $lv->format_size($arrDisk['allocation'], 0);
+ $disk = (array_key_exists('file', $arrDisk)) ? $arrDisk['file'] : $arrDisk['partition'];
+ $dev = $arrDisk['device'];
+ $bus = $arrDisk['bus'];
+ echo "| $disk | {$arrValidDiskBuses[$bus]} | ";
+ if ($state == 'shutoff') {
+ echo "";
+ echo " | ";
+ echo "$allocation | ";
+ echo "detach | ";
+ } else {
+ echo "$capacity | $allocation | N/A | ";
+ }
+ echo " ";
+ }
+ /* end Display VM disks */
+
+ /* Display VM cdroms */
+ foreach ($lv->get_cdrom_stats($res) as $arrCD) {
+ $capacity = $lv->format_size($arrCD['capacity'], 0);
+ $allocation = $lv->format_size($arrCD['allocation'], 0);
+ $disk = (array_key_exists('file', $arrCD)) ? $arrCD['file'] : $arrCD['partition'];
+ $dev = $arrCD['device'];
+ $bus = $arrCD['bus'];
+ echo "| $disk | {$arrValidDiskBuses[$bus]} | $capacity | $allocation | ";
+ if ($state == 'shutoff')
+ echo "detach ";
+ else
+ echo "N/A";
+ echo " | ";
+ }
+
+ /* end Display VM cdroms */
+ echo " ";
+ echo " |
";
+}
+echo "\0".implode($menu);
+?>
\ No newline at end of file
diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js
index fdb94460c..90457b1b5 100644
--- a/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -1,117 +1,93 @@
-function ajaxVMDispatch(currentstate, params){
- $.post("/plugins/dynamix.vm.manager/VMajax.php", params, function( data ) {
+function ajaxVMDispatch(params, reload){
+ var spin = typeof reload != 'undefined';
+ if (spin) $('#vm-'+params['uuid']).addClass('fa-spin');
+ $.post("/plugins/dynamix.vm.manager/VMajax.php", params, function(data) {
if (data.error) {
swal({title:"Execution error",text:data.error,type:"error"});
} else {
- if (!data.state || currentstate != data.state) {
- location = window.location.href;
- }
+ if (spin) setTimeout(reload+'()',500); else location=window.location.href;
}
}, "json");
}
function addVMContext(name, uuid, template, state, vncurl, log){
- var opts = [{header: name, image: "/plugins/dynamix.vm.manager/images/dynamix.vm.manager.png"}];
+ var opts = [{header:name, image:"/plugins/dynamix.vm.manager/images/dynamix.vm.manager.png"}];
var path = location.pathname;
var x = path.indexOf("?");
if (x!=-1) path = path.substring(0,x);
-
if (vncurl !== "") {
- opts.push({text: "VNC Remote", icon: "fa-desktop", action: function(e){ e.preventDefault(); window.open(vncurl, '_blank', 'scrollbars=yes,resizable=yes'); } });
- opts.push({divider: true});
+ opts.push({text:"VNC Remote", icon:"fa-desktop", action:function(e) {
+ e.preventDefault();
+ window.open(vncurl, '_blank', 'scrollbars=yes,resizable=yes');
+ }});
+ opts.push({divider:true});
}
-
if (state == "running") {
-
- opts.push({text: "Stop", icon: "fa-stop", action: function(e) {
- e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-stop", uuid: uuid });
+ opts.push({text:"Stop", icon:"fa-stop", action:function(e) {
+ e.preventDefault();
+ ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist");
}});
-
- opts.push({text: "Pause", icon: "fa-pause", action: function(e) {
+ opts.push({text:"Pause", icon:"fa-pause", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-pause", uuid: uuid });
+ ajaxVMDispatch({action:"domain-pause", uuid:uuid}, "loadlist");
}});
-
- opts.push({text: "Restart", icon: "fa-refresh", action: function(e) {
+ opts.push({text:"Restart", icon:"fa-refresh", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-restart", uuid: uuid });
+ ajaxVMDispatch({action:"domain-restart", uuid:uuid});
}});
-
- opts.push({text: "Hibernate", icon: "fa-bed", action: function(e) {
+ opts.push({text:"Hibernate", icon:"fa-bed", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-pmsuspend", uuid: uuid });
+ ajaxVMDispatch({action:"domain-pmsuspend", uuid:uuid}, "loadlist");
}});
-
- opts.push({text: "Force Stop", icon: "fa-bomb", action: function(e) {
+ opts.push({text:"Force Stop", icon:"fa-bomb", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-destroy", uuid: uuid });
+ ajaxVMDispatch( {action:"domain-destroy", uuid:uuid}, "loadlist");
}});
-
} else if (state == "pmsuspended") {
-
- opts.push({text: "Resume", icon: "fa-play", action: function(e) {
+ opts.push({text:"Resume", icon:"fa-play", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-pmwakeup", uuid: uuid });
+ ajaxVMDispatch({action:"domain-pmwakeup", uuid:uuid}, "loadlist");
}});
-
- opts.push({text: "Force Stop", icon: "fa-bomb", action: function(e) {
+ opts.push({text:"Force Stop", icon:"fa-bomb", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-destroy", uuid: uuid });
+ ajaxVMDispatch({action:"domain-destroy", uuid:uuid}, "loadlist");
}});
-
} else if (state == "paused" || state == "unknown") {
-
- opts.push({text: "Resume", icon: "fa-play", action: function(e) {
+ opts.push({text:"Resume", icon:"fa-play", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-resume", uuid: uuid });
+ ajaxVMDispatch({action:"domain-resume", uuid:uuid}, "loadlist");
}});
-
- opts.push({text: "Force Stop", icon: "fa-bomb", action: function(e) {
+ opts.push({text:"Force Stop", icon:"fa-bomb", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-destroy", uuid: uuid });
+ ajaxVMDispatch({action:"domain-destroy", uuid:uuid}, "loadlist");
}});
-
} else {
-
- opts.push({text: "Start", icon: "fa-play", action: function(e) {
+ opts.push({text:"Start", icon:"fa-play", action:function(e) {
e.preventDefault();
- ajaxVMDispatch(state, { action: "domain-start", uuid: uuid });
+ ajaxVMDispatch({action:"domain-start", uuid:uuid}, "loadlist");
}});
-
}
-
- opts.push({divider: true});
-
+ opts.push({divider:true});
if (log !== "") {
- opts.push({text: "Logs", icon: "fa-navicon", action: function(e){ e.preventDefault(); openWindow('/webGui/scripts/tail_log&arg1=' + log, 'Log for: ' + name, 600, 900); } });
+ opts.push({text:"Logs", icon:"fa-navicon", action:function(e){e.preventDefault(); openWindow('/webGui/scripts/tail_log&arg1=' + log, 'Log for:' + name, 600, 900);}});
}
-
if (state == "shutoff") {
-
- opts.push({text: "Edit", icon: "fa-pencil", href: path+'/UpdateVM?uuid='+uuid });
- opts.push({text: "Edit XML", icon: "fa-code", href: path+'/UpdateVM?template=Custom&uuid='+uuid });
-
- opts.push({divider: true});
-
- opts.push({text: "Remove VM", icon: "fa-minus", action: function(e) {
+ opts.push({text:"Edit", icon:"fa-pencil", href:path+'/UpdateVM?uuid='+uuid});
+ opts.push({text:"Edit XML", icon:"fa-code", href:path+'/UpdateVM?template=Custom&uuid='+uuid});
+ opts.push({divider:true});
+ opts.push({text:"Remove VM", icon:"fa-minus", action:function(e) {
e.preventDefault();
- swal({title:"Are you sure?",text:"Remove definition: "+name,type:"warning",showCancelButton:true},function(){ajaxVMDispatch(state,{action:"domain-undefine",uuid:uuid});});
+ swal({title:"Are you sure?",text:"Remove definition:"+name,type:"warning",showCancelButton:true},function(){ajaxVMDispatch({action:"domain-undefine",uuid:uuid});});
}});
-
if (template != 'OpenELEC') {
- opts.push({text: "Remove VM + Disks", icon: "fa-trash", action: function(e) {
+ opts.push({text:"Remove VM + Disks", icon:"fa-trash", action:function(e) {
e.preventDefault();
- swal({title:"Are you sure?",text:"Completely REMOVE "+name+" disk image and definition",type:"warning",showCancelButton:true},function(){ajaxVMDispatch(state,{action:"domain-delete",uuid:uuid});});
+ swal({title:"Are you sure?",text:"Completely REMOVE "+name+" disk image and definition",type:"warning",showCancelButton:true},function(){ajaxVMDispatch({action:"domain-delete",uuid:uuid});});
}});
}
-
} else {
-
- opts.push({text: "View XML", icon: "fa-code", href: path+'/UpdateVM?template=Custom&uuid='+uuid });
-
+ opts.push({text:"View XML", icon:"fa-code", href:path+'/UpdateVM?template=Custom&uuid='+uuid});
}
-
context.attach('#vm-'+uuid, opts);
}
\ No newline at end of file
diff --git a/plugins/dynamix/DashboardApps.page b/plugins/dynamix/DashboardApps.page
index 4b9d85981..ad3bc393b 100644
--- a/plugins/dynamix/DashboardApps.page
+++ b/plugins/dynamix/DashboardApps.page
@@ -39,132 +39,37 @@ div.Panel:hover{overflow:visible;z-index:10;background-color:unset;}
-
-
No apps available to show
- $allContainers = $DockerClient->getDockerContainers();
- if ( ! $allContainers) { $allContainers = []; }
-
- $arrDockerInfo = $DockerTemplates->getAllInfo();
-}
-
-$allVMs = [];
-if ((pgrep('libvirtd')!==false) && (empty($display['dashapps']) || $display['dashapps'] == 'icons' || $display['dashapps'] == 'vms')) {
- require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php";
-
- $doms = $lv->get_domains();
- if (is_array($doms)) {
- sort($doms);
- $allVMs = $doms;
- }
-}
-
-$contextMenus = [];
-
-// Docker Apps
-foreach ($allContainers as $ct) {
- $name = $ct["Name"];
- $info = $arrDockerInfo[$name];
- $is_autostart = ( $info['autostart'] ) ? 'true' : 'false';
- $updateStatus = $info['updated'];
- $updateStatus = ($updateStatus == "true" or $updateStatus == "undef" ) ? 'true' : 'false';
- $running = ($ct['Running']) ? 'true' : 'false';
- $webGuiUrl = $info['url'];
- $contextMenus[] = sprintf("addDockerContainerContext('%s', '%s', '%s', %s, %s, %s, '%s', '%s', '%s', '%s');", addslashes($ct['Name']), addslashes($ct['ImageId']), addslashes($info['template']), $running, $updateStatus, $is_autostart, addslashes(html_entity_decode($webGuiUrl)), $ct["Id"], addslashes(html_entity_decode($info["Support"])),addslashes(html_entity_decode($info["Project"])) );
- $shape = ($ct["Running"]) ? "play" : "square";
- $status = ($ct["Running"]) ? "started" : "stopped";
-
- $Icon = $info['icon'];
- if (!$Icon) {
- $Icon = "/plugins/dynamix.docker.manager/images/question.png";
- }
-
- print "
-
-
-
-
![](\"")
-
-
-
- " . $name . "
-
-
-
No apps available to show
-
diff --git a/plugins/dynamix/include/DashboardApps.php b/plugins/dynamix/include/DashboardApps.php
new file mode 100644
index 000000000..cf1038f7c
--- /dev/null
+++ b/plugins/dynamix/include/DashboardApps.php
@@ -0,0 +1,79 @@
+
+getDockerContainers() ?: [];
+ ksort($containers);
+ $Allinfo = $DockerTemplates->getAllInfo();
+ $menu = [];
+ foreach ($containers as $ct) {
+ $name = $ct['Name'];
+ $info = &$Allinfo[$name];
+ $id = $ct['Id'];
+ $imageID = $ct['ImageId'];
+ $is_autostart = $info['autostart'] ? 'true':'false';
+ $updateStatus = $info['updated']=='true'||$info[$name]['updated']=='undef' ? 'true':'false';
+ $running = $ct['Running'] ? 'true':'false';
+ $template = $info[$name]['template'];
+ $webGui = html_entity_decode($info['url']);
+ $support = html_entity_decode($info['Support']);
+ $project = html_entity_decode($info['Project']);
+ $menu[] = sprintf("addDockerContainerContext('%s','%s','%s',%s,%s,%s,'%s','%s','%s','%s');",addslashes($name),addslashes($imageID),addslashes($template),$running,$updateStatus,$is_autostart,addslashes($webGui),$id,addslashes($support),addslashes($project));
+ $shape = $ct['Running'] ? 'play':'square';
+ $status = $ct['Running'] ? 'started':'stopped';
+ $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png';
+ echo "";
+ echo "
";
+ echo "
";
+ echo "
";
+ echo "
$name