From 37f194102749d8c262a4a3b063a2f79fe9c4c385 Mon Sep 17 00:00:00 2001 From: mtongnz Date: Fri, 12 Jan 2024 15:25:43 +1300 Subject: [PATCH] fix: remove update buttons for non-dockerman containers --- .../include/DockerClient.php | 1 + .../include/DockerContainers.php | 31 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php index cce7b1bbc..f8a29e19f 100644 --- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php @@ -915,6 +915,7 @@ class DockerClient { $c['Volumes'] = $info['HostConfig']['Binds']; $c['Created'] = $this->humanTiming($ct['Created']); $c['NetworkMode'] = $ct['HostConfig']['NetworkMode']; + $c['Manager'] = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false; [$net, $id] = array_pad(explode(':',$c['NetworkMode']),2,''); $c['CPUset'] = $info['HostConfig']['CpusetCpus']; $c['BaseImage'] = $ct['Labels']['BASEIMAGE'] ?? false; diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php index 9caf1fc20..062aecc88 100644 --- a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -120,20 +120,25 @@ foreach ($containers as $ct) { switch ($updateStatus) { case 0: echo " "._('up-to-date').""; - echo "
"._('force update')."
"; - break; - case 1: - echo "
"._('update ready')."
"; - echo " "._('apply update').""; - break; - case 2: - echo "
"._('rebuild ready')."
"; - echo " "._('rebuilding').""; - break; - default: - echo " "._('not available').""; - echo "
"._('force update')."
"; + if ($ct['Manager'] == "dockerman") + echo "
"._('force update')."
"; break; + case 1: + echo "
"._('update ready')."
"; + if ($ct['Manager'] == "dockerman") + echo " "._('apply update').""; + else + echo " "._('update available').""; + break; + case 2: + echo "
"._('rebuild ready')."
"; + echo " "._('rebuilding').""; + break; + default: + echo " "._('not available').""; + if ($ct['Manager'] == "dockerman") + echo "
"._('force update')."
"; + break; } echo "
".compress(_($version),12,0)."
"; echo "{$ct['NetworkMode']}";