Docker daemon process name is now dockerd

This commit is contained in:
Eric Schultz
2017-03-23 11:39:52 -05:00
parent babde7028f
commit b694c29937
6 changed files with 8 additions and 8 deletions
@@ -1,5 +1,5 @@
Title="Add Container"
Cond="(pgrep('docker')!==false)"
Cond="(pgrep('dockerd')!==false)"
Markdown="false"
---
<?PHP
@@ -1,6 +1,6 @@
Menu="Docker:1"
Title="Docker Containers"
Cond="(pgrep('docker')!==false)"
Cond="(pgrep('dockerd')!==false)"
Markdown="false"
---
<?PHP
@@ -1,6 +1,6 @@
Menu="Docker:2"
Title="Docker Repositories"
Cond="(pgrep('docker')!==false)"
Cond="(pgrep('dockerd')!==false)"
---
<?PHP
/* Copyright 2005-2016, Lime Technology
@@ -62,7 +62,7 @@ if (file_exists($realfile)) {
after the array has been started.</p>
</blockquote>
<?if (pgrep('docker') === false):?>
<?if (pgrep('dockerd') === false):?>
<div class="advanced">
<dl>
@@ -154,7 +154,7 @@ if (file_exists($realfile)) {
<form id="removeForm" method="POST" action="/update.php" target="progressFrame">
<input type="hidden" name="#command" value="/plugins/dynamix.docker.manager/scripts/docker_rm" />
</form>
<?if (pgrep('docker') !== false):?>
<?if (pgrep('dockerd') !== false):?>
<div class="advanced">
<div id="title"><span class="left"><img src="/plugins/dynamix.docker.manager/icons/vcard.png" class="icon">Docker volume info</span></div>
@@ -1,5 +1,5 @@
Title="Update Container"
Cond="(pgrep('docker')!==false)"
Cond="(pgrep('dockerd')!==false)"
Markdown="false"
---
<?PHP
+2 -2
View File
@@ -1,6 +1,6 @@
Menu="Dashboard:1"
Title="Apps"
Cond="(((pgrep('docker')!==false) || (pgrep('libvirtd')!==false)) && ($display['dashapps']!='none'))"
Cond="(((pgrep('dockerd')!==false) || (pgrep('libvirtd')!==false)) && ($display['dashapps']!='none'))"
Markdown="false"
---
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.ui.css">
@@ -41,7 +41,7 @@ div.Panel:hover{overflow:visible;z-index:10;}
<div id="apps_icons" style="display:none">
<?
$allContainers = [];
if ((pgrep('docker')!==false) && (empty($display['dashapps']) || $display['dashapps'] == 'icons' || $display['dashapps'] == 'docker')) {
if ((pgrep('dockerd')!==false) && (empty($display['dashapps']) || $display['dashapps'] == 'icons' || $display['dashapps'] == 'docker')) {
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
$DockerClient = new DockerClient();
$DockerUpdate = new DockerUpdate();