Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/examples/dind.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ services:
# environment:
# - TESTCONTAINERS_HOST_OVERRIDE=host.docker.internal
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/run/docker.sock.raw:/var/run/docker.sock
```
12 changes: 1 addition & 11 deletions src/Testcontainers/Builders/ContainerBuilder`3.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,7 @@ public TBuilderEntity WithImage(string image)
/// <inheritdoc />
public TBuilderEntity WithImage(IImage image)
{
if (string.IsNullOrEmpty(TestcontainersSettings.HubImageNamePrefix))
{
return Clone(new ContainerConfiguration(image: image));
}

if (!string.IsNullOrEmpty(image.GetHostname()))
{
return Clone(new ContainerConfiguration(image: image));
}

return Clone(new ContainerConfiguration(image: new DockerImage(image.Repository, image.Registry, image.Tag, image.Digest, TestcontainersSettings.HubImageNamePrefix)));
return Clone(new ContainerConfiguration(image: image.ApplyHubImageNamePrefix()));
}

/// <inheritdoc />
Expand Down
4 changes: 2 additions & 2 deletions src/Testcontainers/Builders/IImageFromDockerfileBuilder`1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ public interface IImageFromDockerfileBuilder<out TBuilderEntity>
/// <summary>
/// Sets the name.
/// </summary>
/// <param name="name">The name.</param>
/// <param name="image">The image.</param>
/// <returns>A configured instance of <typeparamref name="TBuilderEntity" />.</returns>
[PublicAPI]
TBuilderEntity WithName(IImage name);
TBuilderEntity WithName(IImage image);

/// <summary>
/// Sets the Dockerfile.
Expand Down
4 changes: 2 additions & 2 deletions src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public ImageFromDockerfileBuilder WithName(string name)
}

/// <inheritdoc />
public ImageFromDockerfileBuilder WithName(IImage name)
public ImageFromDockerfileBuilder WithName(IImage image)
{
return Merge(DockerResourceConfiguration, new ImageFromDockerfileConfiguration(image: name));
return Merge(DockerResourceConfiguration, new ImageFromDockerfileConfiguration(image: image.ApplyHubImageNamePrefix()));
}

/// <inheritdoc />
Expand Down
33 changes: 33 additions & 0 deletions src/Testcontainers/Images/IImageExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
namespace DotNet.Testcontainers.Images
{
using DotNet.Testcontainers.Configurations;

/// <summary>
/// Provides extension methods for the <see cref="IImage" /> interface.
/// </summary>
internal static class IImageExtensions
{
/// <summary>
/// Applies the Docker Hub image name prefix if it is configured.
/// </summary>
/// <param name="image">The original <see cref="IImage" /> instance.</param>
/// <returns>
/// A new <see cref="IImage" /> instance with the Docker Hub image name prefix
/// applied, or the original instance if no prefix is set.
/// </returns>
public static IImage ApplyHubImageNamePrefix(this IImage image)
{
if (string.IsNullOrEmpty(TestcontainersSettings.HubImageNamePrefix))
{
return image;
}

if (!string.IsNullOrEmpty(image.GetHostname()))
{
return image;
}

return new DockerImage(image.Repository, image.Registry, image.Tag, image.Digest, TestcontainersSettings.HubImageNamePrefix);
}
}
}