Fix container image version number processing

dlang-dockerized · Aug 6, 2024 · debcade · debcade
1 parent b2f079c
commit debcade
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/tools/ddct-src/Datatype/ContainerVersionTag.php b/tools/ddct-src/Datatype/ContainerVersionTag.php
@@ -199,10 +199,14 @@ private static function parseSemantic(string $input, bool $lax): ?SemVer
             return null;
         }
 
+        $major = ($matches['major'] === null) ? null : (int)$matches['major'];
+        $minor = ($matches['minor'] === null) ? null : (int)$matches['minor'];
+        $patch = ($matches['patch'] === null) ? null : (int)$matches['patch'];
+
         return new SemVer(
-            (int)$matches['major'],
-            (int)$matches['minor'],
-            (int)$matches['patch'],
+            $major,
+            $minor,
+            $patch,
             $matches['prerelease'] ?? null,
         );
     }

diff --git a/tools/ddct-src/Util/ContainerBuilder.php b/tools/ddct-src/Util/ContainerBuilder.php
@@ -132,6 +132,9 @@ public function hasBuiltExact(string $app, ContainerVersionTag $version): ?Conta
             if ($imageVersion === null) {
                 continue;
             }
+            if (!$imageVersion->isFullVersionNumber()) {
+                continue;
+            }
 
             $diff = ContainerVersionTag::compare($imageVersion, $version);
             if ($diff === 0) {