mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-19 12:49:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Docker enhancements and corrections

Browse Source 
- delete cache files when container is deleted
- improved handling of user defined networks
-  optimized reading of container and image settings
- improved handling of container IP address assignment
- code optimization and consistency
This commit is contained in:
bergware
2018-04-02 13:18:31 +02:00
parent 9fa3981a8f
commit b6d86dc5f7
7 changed files with 320 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/include/ContainerManager.php
+8 -6
View File
@@ -15,18 +15,20 @@
$user_prefs = '/boot/config/plugins/dockerMan/userprefs.cfg';
# controlled docker execution
function docker($cmd, &$var=null) {
return exec("docker $cmd 2>/dev/null", $var);
function docker($cmd) {
$data = exec("docker $cmd 2>/dev/null", $array);
return count($array)>1 ? $array : $data;
}
$action = $_POST['action'];
$status = $action=='start' ? 'exited' : 'running';
$all_containers=[]; docker("ps -a --filter status='$status' --format='{{.Names}}'", $all_containers);
$containers = docker("ps -a --filter status='$status' --format='{{.Names}}'");
if (file_exists($user_prefs)) {
$prefs = parse_ini_file($user_prefs); $sort = [];
foreach ($all_containers as $ct) $sort[] = array_search($ct,$prefs) ?? 999;
array_multisort($sort, ($action=='start'?SORT_ASC:SORT_DESC), SORT_NUMERIC, $all_containers);
foreach ($containers as $ct) $sort[] = array_search($ct,$prefs) ?? 999;
array_multisort($sort, ($action=='start'?SORT_ASC:SORT_DESC), SORT_NUMERIC, $containers);
}
foreach ($all_containers as $ct) docker("$action $ct >/dev/null");
foreach ($containers as $ct) docker("$action $ct >/dev/null");
?>