refactor: extract getContainerVersion method from inline loops

Author: nzxl101

root/app/www/public/ajax/containers.php

@@ -566,8 +566,8 @@
             $apiRequest = apiRequest('docker/container/pull', [], ['name' => $image]);
             logger(UI_LOG, 'docker/container/pull:' . json_encode($apiRequest, JSON_UNESCAPED_SLASHES));
 
-            $apiRequest = apiRequest('docker/container/inspect', ['name' => $image, 'useCache' => false, 'format' => true]);
-            $apiRequest = json_decode($apiRequest['result'], true);
+            $apiRequest             = apiRequest('docker/container/inspect', ['name' => $image, 'useCache' => false, 'format' => true]);
+            $apiRequest             = json_decode($apiRequest['result'], true);
             list($cr, $imageDigest) = explode('@', $apiRequest[0]['RepoDigests'][0]);
             logger(UI_LOG, 'dockerInspect:' . json_encode($apiRequest, JSON_UNESCAPED_SLASHES));
 
@@ -588,7 +588,7 @@
             break;
         case '6': //-- GENERATE COMPOSE
             $containerList = '';
-            $containers = explode(',', $_POST['hash']);
+            $containers    = explode(',', $_POST['hash']);
 
             foreach ($containers as $selectedContainer) {
                 $thisContainer = $docker->findContainer(['hash' => $selectedContainer, 'data' => $stateFile]);
@@ -615,14 +615,8 @@
                 $inspectImage = $apiResponse['result'];
 
                 if ($inspectImage) {
-                    $inspect = json_decode($inspectImage, true);
-
-                    foreach ($inspect[0]['Config']['Labels'] as $label => $val) {
-                        if (str_contains($label, 'image.version')) {
-                            $preVersion = $val;
-                            break;
-                        }
-                    }
+                    $inspect    = json_decode($inspectImage, true);
+                    $preVersion = $docker->getContainerVersion($inspect);
                 }
 
                 $apiRequest = apiRequest('docker/container/pull', [], ['name' => $image]);
@@ -649,12 +643,7 @@
                     list($cr, $imageDigest) = explode('@', $inspectImage[0]['RepoDigests'][0]);
 
                     if ($inspectImage) {
-                        foreach ($inspectImage[0]['Config']['Labels'] as $label => $val) {
-                            if (str_contains($label, 'image.version')) {
-                                $postVersion = $val;
-                                break;
-                            }
-                        }
+                        $postVersion = $docker->getContainerVersion($inspectImage);
                     }
 
                     $updateResult              = 'complete';
@@ -684,7 +673,7 @@
             $result = 'Container ' . $container['Names'] . ' update: ' . $updateResult . ($preVersion && $postVersion && $updateResult == 'complete' ? ' from \'' . $preVersion . '\' to \'' . $postVersion . '\'' : '') . '<br>';
             break;
         case '8': //-- MOUNT COMPARE
-            $result = $container['Names'] . '<br>';
+            $result  = $container['Names'] . '<br>';
             $result .= '<div class="ms-4">' . implode('<br>', $container['inspect'][0]['HostConfig']['Binds']) . '</div><br>';
             break;
         case '9': //-- REMOVE
@@ -704,7 +693,7 @@
             logger(UI_LOG, 'dockerAPI/container/create:' . json_encode($apiRequest, JSON_UNESCAPED_SLASHES));
             $apiRequest = json_decode($apiRequest['result'], true);
 
-            $result = $container['Names'] . '<br>';
+            $result  = $container['Names'] . '<br>';
             $result .= 'Endpoint: <code>' . $apiRequest['endpoint'] . '</code><br>';
             $result .= '<pre>' . json_encode($apiRequest['payload'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . '</pre>';
             break;
@@ -713,12 +702,7 @@
             logger(UI_LOG, 'docker/container/inspect: ' . json_encode($apiResponse, JSON_UNESCAPED_SLASHES));
             $inspectImage = json_decode($apiResponse['result'], true);
 
-            foreach ($inspectImage[0]['Config']['Labels'] as $label => $val) {
-                if (str_contains($label, 'image.version')) {
-                    $version = $val;
-                    break;
-                }
-            }
+            $version = $docker->getContainerVersion($inspectImage);
 
             logger(UI_LOG, 'Getting registry digest: ' . $image);
             $regctlDigest = trim(regctlCheck($image));

root/app/www/public/classes/traits/Docker/Container.php

@@ -191,4 +191,32 @@ public function exec($container, $command)
 
         return $this->output;
     }
+
+    public function getContainerVersion($inspect, $ui = true)
+    {
+        $return = '';
+
+        //-- CHECK: Config.Labels -> org.opencontainers.image.version
+        foreach ($inspect[0]['Config']['Labels'] as $label => $val) {
+            if (str_contains($label, 'image.version')) {
+                $return = $val;
+                break;
+            }
+        }
+        //-- CHECK: Config.Env -> VERSION
+        foreach ($inspect[0]['Config']['Env'] as $env => $val) {
+            if (str_starts_with(strtoupper($val), 'VERSION=')) {
+                $return = explode('=', $val)[1];
+                break;
+            }
+        }
+        //-- ADD LINKS IF POSSIBLE
+        $rev    = substr($inspect[0]['Config']['Labels']['org.opencontainers.image.revision'] ?? '', 0, 7);
+        $source = $inspect[0]['Config']['Labels']['org.opencontainers.image.source'] ?? '';
+        if (!empty($rev) && !empty($source)) {
+            $link    = $source . '/commit/' . $rev;
+            $return .= $ui ? ' <a href="' . $link . '" target="_blank">' . $rev . '</a>' : '[' . $rev . '](' . $link . ')';
+        }
+        return $return;
+    }
 }

root/app/www/public/crons/pulls.php

@@ -101,12 +101,7 @@
                 $inspectImage = json_decode($inspectImage, true);
 
                 if ($inspectImage) {
-                    foreach ($inspectImage[0]['Config']['Labels'] as $label => $val) {
-                        if (str_contains($label, 'image.version')) {
-                            $preVersion = $val;
-                            break;
-                        }
-                    }
+                    $preVersion = $docker->getContainerVersion($inspectImage, false);
                 }
 
                 $msg = 'Pre image version: ' . $preVersion;
@@ -271,12 +266,7 @@
                                     $inspectImage = json_decode($inspectImage, true);
 
                                     if ($inspectImage) {
-                                        foreach ($inspectImage[0]['Config']['Labels'] as $label => $val) {
-                                            if (str_contains($label, 'image.version')) {
-                                                $postVersion = $val;
-                                                break;
-                                            }
-                                        }
+                                        $postVersion = $docker->getContainerVersion($inspectImage, false);
                                     }
 
                                     $msg = 'Post image version: ' . $postVersion;