[#470] #BUGFIX 'assemblyName: DotNet.Testcontainers; function: Docker…

…Image' {Consider hostname of Docker Hub image name prefix when configured.}
testcontainers · Jun 8, 2022 · f3096c0 · f3096c0
1 parent ad6665b
commit f3096c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/DotNet.Testcontainers/Images/DockerImage.cs b/src/DotNet.Testcontainers/Images/DockerImage.cs
@@ -91,7 +91,7 @@ public string FullName
     /// <inheritdoc />
     public string GetHostname()
     {
-      var firstSegmentOfRepository = this.Repository.Split('/').First();
+      var firstSegmentOfRepository = (string.IsNullOrEmpty(this.hubImageNamePrefix) ? this.Repository : this.hubImageNamePrefix).Split('/').First();
       return firstSegmentOfRepository.IndexOfAny(new[] { '.', ':' }) >= 0 ? firstSegmentOfRepository : null;
     }
   }

diff --git a/...tNet.Testcontainers.Tests/Unit/Configurations/DockerRegistryAuthenticationProviderTest.cs b/...tNet.Testcontainers.Tests/Unit/Configurations/DockerRegistryAuthenticationProviderTest.cs
@@ -37,6 +37,17 @@ public void GetHostnameFromDockerImage(string dockerImageName, string hostname)
       Assert.Equal(hostname, image.GetHostname());
     }
 
+    [Theory]
+    [InlineData("", "docker", "stable")]
+    [InlineData("fedora", "httpd", "1.0")]
+    [InlineData("foo/bar", "baz", "1.0.0")]
+    public void GetHostnameFromHubImageNamePrefix(string repository, string name, string tag)
+    {
+      const string hubImageNamePrefix = "myregistry.azurecr.io";
+      IDockerImage image = new DockerImage(repository, name, tag, hubImageNamePrefix);
+      Assert.Equal(hubImageNamePrefix, image.GetHostname());
+    }
+
     [Fact]
     public void ShouldGetDefaultDockerRegistryAuthenticationConfiguration()
     {