fix setting annotation image name prefix: set to 'docker.io/' when repostory contains /, and 'docker.io/library/' when it doesn't; add tests

Author: Surayya Huseyn Zada

src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs

@@ -92,6 +92,8 @@ internal static string GenerateImageIndex(BuiltImage[] images, string manifestMe
 
     internal static string GenerateImageIndexWithAnnotations(string manifestMediaType, string manifestDigest, long manifestSize, string repository, string[] tags)
     {
+        string containerdImageNamePrefix = repository.Contains('/') ? "docker.io/" : "docker.io/library/";
+        
         var manifests = new PlatformSpecificOciManifest[tags.Length];
         for (int i = 0; i < tags.Length; i++)
         {
@@ -103,7 +105,7 @@ internal static string GenerateImageIndexWithAnnotations(string manifestMediaTyp
                 digest = manifestDigest,
                 annotations = new Dictionary<string, string> 
                 {
-                    { "io.containerd.image.name", $"docker.io/library/{repository}:{tag}" },
+                    { "io.containerd.image.name", $"{containerdImageNamePrefix}{repository}:{tag}" },
                     { "org.opencontainers.image.ref.name", tag } 
                 }
             };

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs

@@ -21,3 +21,22 @@ public DockerIsAvailableAndSupportsArchFactAttribute(string arch, bool checkCont
         }
     }
 }
+
+public class DockerIsAvailableAndSupportsArchTheoryAttribute : TheoryAttribute
+{
+    public DockerIsAvailableAndSupportsArchTheoryAttribute(string arch, bool checkContainerdStoreAvailability = false)
+    {
+        if (!DockerSupportsArchHelper.DaemonIsAvailable)
+        {
+            base.Skip = "Skipping test because Docker is not available on this host.";
+        }
+        else if (checkContainerdStoreAvailability && !DockerSupportsArchHelper.IsContainerdStoreEnabledForDocker)
+        {
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
+        }
+        else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
+        {
+            base.Skip = $"Skipping test because Docker daemon does not support {arch}.";
+        }
+    }
+}

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -721,10 +721,11 @@ public void EndToEnd_SingleArch_NoRid()
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
-    public void EndToEndMultiArch_LocalRegistry()
+    [InlineData("endtoendmultiarch-localregisty")]
+    [InlineData("myteam/endtoendmultiarch-localregisty")]
+    [DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
+    public void EndToEndMultiArch_LocalRegistry(string imageName)
     {
-        string imageName = NewImageName();
         string tag = "1.0";
         string image = $"{imageName}:{tag}";
 
@@ -759,7 +760,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "--platform",
             "linux/amd64",
             "--name",
-            $"test-container-{imageName}-x64",
+            $"test-container-{imageName.Replace('/', '-')}-x64",
             image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
@@ -770,7 +771,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "--platform",
             "linux/arm64",
             "--name",
-            $"test-container-{imageName}-arm64",
+            $"test-container-{imageName.Replace('/', '-')}-arm64",
             image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
@@ -904,10 +905,11 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
     private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
         => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
-    public void EndToEndMultiArch_ArchivePublishing()
+    [InlineData("endtoendmultiarch-archivepublishing")]
+    [InlineData("myteam/endtoendmultiarch-archivepublishing")]
+    [DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
+    public void EndToEndMultiArch_ArchivePublishing(string imageName)
     {
-        string imageName = NewImageName();
         string tag = "1.0";
         string image = $"{imageName}:{tag}";
         string archiveOutput = TestSettings.TestArtifactsDirectory;
@@ -953,7 +955,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             "--platform",
             "linux/amd64",
             "--name",
-            $"test-container-{imageName}-x64",
+            $"test-container-{imageName.Replace('/', '-')}-x64",
             image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
@@ -964,7 +966,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             "--platform",
             "linux/arm64",
             "--name",
-            $"test-container-{imageName}-arm64",
+            $"test-container-{imageName.Replace('/', '-')}-arm64",
             image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");