Restore but undocument three-part version tags with arch

dotnet · Oct 4, 2024 · 4adb8b6 · 4adb8b6
1 parent 2dbd12f
commit 4adb8b6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/manifest.json b/manifest.json
@@ -9418,7 +9418,11 @@
               "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux.extensions",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
-              "tags": {}
+              "tags": {
+                "$(monitor|9.0|fixed-tag)-amd64": {
+                  "docType": "Undocumented"
+                }
+              }
             },
             {
               "architecture": "arm64",
@@ -9429,7 +9433,11 @@
               "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux.extensions",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
-              "tags": {},
+              "tags": {
+                "$(monitor|9.0|fixed-tag)-arm64v8": {
+                  "docType": "Undocumented"
+                }
+              },
               "variant": "v8"
             }
           ]

diff --git a/tests/Microsoft.DotNet.Docker.Tests/StaticTagTests.cs b/tests/Microsoft.DotNet.Docker.Tests/StaticTagTests.cs
@@ -283,7 +283,7 @@ private static IEnumerable<object[]> GetTagTestObjects(TestType testType)
                                     VersionType.MajorMinorPatch, 
                                     checkOs: true, 
                                     checkArchitecture: true, 
-                                    skipDockerfileOn: info => IsApplianceVersionWithoutDistroTags(info) || IsApplianceVersionWithoutArchTags(info)
+                                    skipDockerfileOn: IsApplianceVersionWithoutDistroTags
                                 ), // <Major.Minor.Patch>-<os>-<architecture>
 
                                 GetTagTestInput(
@@ -301,7 +301,7 @@ private static IEnumerable<object[]> GetTagTestObjects(TestType testType)
                                     VersionType.MajorMinorPatch, 
                                     checkOs: false, 
                                     checkArchitecture: true, 
-                                    skipDockerfileOn: info => IsApplianceVersionWithDistroTags(info) || IsApplianceVersionWithoutArchTags(info)
+                                    skipDockerfileOn: IsApplianceVersionWithDistroTags
                                 ), // <Major.Minor.Patch>-<architecture>
 
                                 GetTagTestInput(
@@ -310,7 +310,7 @@ private static IEnumerable<object[]> GetTagTestObjects(TestType testType)
                                     VersionType.MajorMinor, 
                                     checkOs: true, 
                                     checkArchitecture: true, 
-                                    skipDockerfileOn: info => IsApplianceVersionWithoutDistroTags(info) || IsApplianceVersionWithoutArchTags(info)
+                                    skipDockerfileOn: info => IsApplianceVersionWithoutDistroTags(info) || IsApplianceVersionWithMajorMinorTagsWithoutArchTags(info)
                                 ), // <Major.Minor>-<os>-<architecture>
 
                                 GetTagTestInput(
@@ -328,7 +328,7 @@ private static IEnumerable<object[]> GetTagTestObjects(TestType testType)
                                     VersionType.MajorMinor, 
                                     checkOs: false, 
                                     checkArchitecture: true, 
-                                    skipDockerfileOn: info => IsApplianceVersionWithDistroTags(info) || IsApplianceVersionWithoutArchTags(info)
+                                    skipDockerfileOn: info => IsApplianceVersionWithDistroTags(info) || IsApplianceVersionWithMajorMinorTagsWithoutArchTags(info)
                                 ), // <Major.Minor>-<architecture>
 
                                 GetTagTestInput(
@@ -337,7 +337,7 @@ private static IEnumerable<object[]> GetTagTestObjects(TestType testType)
                                     VersionType.Major, 
                                     checkOs: true, 
                                     checkArchitecture: true, 
-                                    skipDockerfileOn: info => IsApplianceVersionWithoutDistroTags(info) || IsApplianceVersionWithoutArchTags(info)
+                                    skipDockerfileOn: IsApplianceVersionWithoutDistroTags
                                 ), // <Major>-<os>-<architecture>
 
                                 GetTagTestInput(
@@ -533,13 +533,13 @@ private static object[] GetTagTestInput(
         private static bool IsWindows(ManifestHelper.DockerfileInfo dockerfileInfo) =>
             dockerfileInfo.Os.Contains("windowsservercore") || dockerfileInfo.Os.Contains("nanoserver");
 
-        // All appliance-style images do not have arch-specific tags starting with version 9
-        private static bool IsApplianceVersionWithArchTags(ManifestHelper.DockerfileInfo dockerfileInfo) =>
+        // All appliance-style images do not have arch-specific tags for <major>.<minor> tags starting with version 9
+        private static bool IsApplianceVersionWithMajorMinorTagsWithArchTags(ManifestHelper.DockerfileInfo dockerfileInfo) =>
             (dockerfileInfo.Repo.Contains("monitor") && GetVersion(dockerfileInfo.MajorMinor).Major <= 8) ||
             (dockerfileInfo.Repo.Contains("aspire") && GetVersion(dockerfileInfo.MajorMinor).Major <= 8);
 
-        private static bool IsApplianceVersionWithoutArchTags(ManifestHelper.DockerfileInfo dockerfileInfo) =>
-            !IsApplianceVersionWithArchTags(dockerfileInfo);
+        private static bool IsApplianceVersionWithMajorMinorTagsWithoutArchTags(ManifestHelper.DockerfileInfo dockerfileInfo) =>
+            !IsApplianceVersionWithMajorMinorTagsWithArchTags(dockerfileInfo);
 
         // Certain versions of appliance repos use a new tag schema.
         // This new schema excludes the OS from all tags.