chore: Set remaining container image explicit (#1606)

Co-authored-by: Andre Hofmeister <[email protected]>

Author: digital88

src/Testcontainers.EventHubs/EventHubsBuilder.cs

@@ -142,7 +142,7 @@ public override EventHubsContainer Build()
         var network = new NetworkBuilder()
             .Build();
 
-        var container = new AzuriteBuilder()
+        var container = new AzuriteBuilder("mcr.microsoft.com/azure-storage/azurite:3.28.0")
             .WithNetwork(network)
             .WithNetworkAliases(AzuriteNetworkAlias)
             .Build();

src/Testcontainers.ServiceBus/ServiceBusBuilder.cs

@@ -147,7 +147,7 @@ public override ServiceBusContainer Build()
         var network = new NetworkBuilder()
             .Build();
 
-        var container = new MsSqlBuilder()
+        var container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
             .WithNetwork(network)
             .WithNetworkAliases(DatabaseNetworkAlias)
             .Build();

src/Testcontainers/Containers/SocatBuilder.cs

@@ -6,21 +6,54 @@ namespace DotNet.Testcontainers.Containers
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Builders;
   using DotNet.Testcontainers.Configurations;
+  using DotNet.Testcontainers.Images;
   using JetBrains.Annotations;
 
   /// <inheritdoc cref="ContainerBuilder{TBuilderEntity, TContainerEntity, TConfigurationEntity}" />
   [PublicAPI]
   public sealed class SocatBuilder : ContainerBuilder<SocatBuilder, SocatContainer, SocatConfiguration>
   {
-    public const string SocatImage = "alpine/socat:1.7.4.3-r0";
+    [Obsolete("This constant is obsolete and will be removed in the future. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.")]
+    public const string SocatImage = "alpine/socat:1.7.4.4";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SocatBuilder" /> class.
     /// </summary>
+    [Obsolete("This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.")]
     public SocatBuilder()
-      : this(new SocatConfiguration())
+      : this(SocatImage)
     {
-      DockerResourceConfiguration = Init().DockerResourceConfiguration;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SocatBuilder" /> class.
+    /// </summary>
+    /// <param name="image">
+    /// The full Docker image name, including the image repository and tag
+    /// (e.g., <c>alpine/socat:1.7.4.4</c>).
+    /// </param>
+    /// <remarks>
+    /// Docker image tags available at <see href="https://hub.docker.com/r/alpine/socat/tags" />.
+    /// </remarks>
+    public SocatBuilder(string image)
+        : this(new DockerImage(image))
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SocatBuilder" /> class.
+    /// </summary>
+    /// <param name="image">
+    /// An <see cref="IImage" /> instance that specifies the Docker image to be used
+    /// for the container builder configuration.
+    /// </param>
+    /// <remarks>
+    /// Docker image tags available at <see href="https://hub.docker.com/r/alpine/socat/tags" />.
+    /// </remarks>
+    public SocatBuilder(IImage image)
+        : this(new SocatConfiguration())
+    {
+        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

tests/Testcontainers.EventHubs.Tests/EventHubsContainerTest.cs

@@ -108,7 +108,7 @@ public DatabaseFixture()
             Network = new NetworkBuilder()
                 .Build();
 
-            Container = new AzuriteBuilder()
+            Container = new AzuriteBuilder("mcr.microsoft.com/azure-storage/azurite:3.28.0")
                 .WithNetwork(Network)
                 .WithNetworkAliases(AzuriteNetworkAlias)
                 .Build();

tests/Testcontainers.Platform.Linux.Tests/ConnectionStringProviderTest.cs

@@ -12,8 +12,7 @@ public sealed class Configured : IAsyncLifetime
 
         public Configured()
         {
-            _container = new ContainerBuilder()
-                .WithImage(CommonImages.Alpine)
+            _container = new ContainerBuilder(CommonImages.Alpine)
                 .WithCommand(CommonCommands.SleepInfinity)
                 .WithConnectionStringProvider(_connectionStringProvider)
                 .Build();
@@ -42,8 +41,7 @@ public void GetConnectionStringReturnsExpectedValue()
 
     public sealed class NotConfigured : IAsyncLifetime
     {
-        private readonly IContainer _container = new ContainerBuilder()
-            .WithImage(CommonImages.Alpine)
+        private readonly IContainer _container = new ContainerBuilder(CommonImages.Alpine)
             .WithCommand(CommonCommands.SleepInfinity)
             .Build();
 

tests/Testcontainers.Platform.Linux.Tests/SocatContainerTest.cs

@@ -20,7 +20,7 @@ public SocatContainerTest()
             .WithNetworkAliases(HelloWorldAlias)
             .Build();
 
-        _socatContainer = new SocatBuilder()
+        _socatContainer = new SocatBuilder(CommonImages.Socat)
             .WithNetwork(_network)
             .WithTarget(8080, HelloWorldAlias)
             .WithTarget(8081, HelloWorldAlias, 8080)

tests/Testcontainers.ServiceBus.Tests/DeclineLicenseAgreementTest.cs

@@ -9,15 +9,15 @@ public sealed partial class DeclineLicenseAgreementTest
     [Trait(nameof(DockerCli.DockerPlatform), nameof(DockerCli.DockerPlatform.Linux))]
     public void WithoutAcceptingLicenseAgreementThrowsArgumentException()
     {
-        var exception = Assert.Throws<ArgumentException>(() => new ServiceBusBuilder().Build());
+        var exception = Assert.Throws<ArgumentException>(() => new ServiceBusBuilder(TestSession.GetImageFromDockerfile()).Build());
         Assert.Matches(LicenseAgreementNotAccepted(), exception.Message);
     }
 
     [Fact]
     [Trait(nameof(DockerCli.DockerPlatform), nameof(DockerCli.DockerPlatform.Linux))]
     public void WithLicenseAgreementDeclinedThrowsArgumentException()
     {
-        var exception = Assert.Throws<ArgumentException>(() => new ServiceBusBuilder().WithAcceptLicenseAgreement(false).Build());
+        var exception = Assert.Throws<ArgumentException>(() => new ServiceBusBuilder(TestSession.GetImageFromDockerfile()).WithAcceptLicenseAgreement(false).Build());
         Assert.Matches(LicenseAgreementNotAccepted(), exception.Message);
     }
 }

tests/Testcontainers.ServiceBus.Tests/ServiceBusContainerTest.cs

@@ -116,7 +116,7 @@ public DatabaseFixture()
             Network = new NetworkBuilder()
                 .Build();
 
-            Container = new MsSqlBuilder()
+            Container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
                 .WithNetwork(Network)
                 .WithNetworkAliases(DatabaseNetworkAlias)
                 .Build();

tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerMTls.cs

@@ -2,11 +2,12 @@ namespace DotNet.Testcontainers.Tests.Fixtures
 {
   using System.Collections.Generic;
   using DotNet.Testcontainers.Builders;
+  using DotNet.Testcontainers.Images;
 
   public abstract class DockerMTls : ProtectDockerDaemonSocket
   {
     public DockerMTls(string dockerImageVersion)
-      : base(new ContainerBuilder(), dockerImageVersion)
+      : base(new ContainerBuilder("docker:" + dockerImageVersion + "-dind"))
     {
     }
 

tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixture.cs

@@ -2,14 +2,15 @@ namespace DotNet.Testcontainers.Tests.Fixtures
 {
   using System.Collections.Generic;
   using DotNet.Testcontainers.Builders;
+  using DotNet.Testcontainers.Images;
   using JetBrains.Annotations;
 
   [UsedImplicitly]
   public sealed class DockerTlsFixture : ProtectDockerDaemonSocket
   {
     public DockerTlsFixture()
-      : base(new ContainerBuilder()
-        .WithCommand("--tlsverify=false"), "29.0.0")
+      : base(new ContainerBuilder("docker:29.0.0-dind")
+        .WithCommand("--tlsverify=false"))
     {
     }