Merge branch 'develop' of github.com:testcontainers/testcontainers-dotnet into develop

Author: HofmeisterAn

Testcontainers.slnx

@@ -26,7 +26,6 @@
         <Project Path="src/Testcontainers.DynamoDb/Testcontainers.DynamoDb.csproj"/>
         <Project Path="src/Testcontainers.Elasticsearch/Testcontainers.Elasticsearch.csproj"/>
         <Project Path="src/Testcontainers.EventHubs/Testcontainers.EventHubs.csproj"/>
-        <Project Path="src/Testcontainers.EventStoreDb/Testcontainers.EventStoreDb.csproj"/>
         <Project Path="src/Testcontainers.FakeGcsServer/Testcontainers.FakeGcsServer.csproj"/>
         <Project Path="src/Testcontainers.FirebirdSql/Testcontainers.FirebirdSql.csproj"/>
         <Project Path="src/Testcontainers.Firestore/Testcontainers.Firestore.csproj"/>

src/Templates/CSharp/Testcontainers.ModuleName/ModuleNameBuilder.cs

@@ -15,7 +15,7 @@ public sealed class ModuleNameBuilder : ContainerBuilder<ModuleNameBuilder, Modu
     /// Docker image tags available at <see href="https://hub.docker.com/..." />.
     /// </remarks>
     public ModuleNameBuilder(string image)
-        : this(new ModuleNameConfiguration())
+        : this(new DockerImage(image))
     {
         // 1) To change the ContainerBuilder default configuration override the DockerResourceConfiguration property and the "ModuleNameBuilder Init()" method.
         //    Append the module configuration to base.Init() e.g. base.Init().WithXXX().
@@ -25,8 +25,6 @@ public ModuleNameBuilder(string image)
 
         // 3) Add custom builder methods to extend the ContainerBuilder capabilities such as "ModuleNameBuilder WithModuleNameConfig(object)".
         //    Merge the current module configuration with a new instance of the immutable ModuleNameConfiguration type to update the module configuration.
-
-        // DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Templates/CSharp/Testcontainers.ModuleName/Usings.cs

@@ -6,5 +6,6 @@
 global using DotNet.Testcontainers.Builders;
 global using DotNet.Testcontainers.Configurations;
 global using DotNet.Testcontainers.Containers;
+global using DotNet.Testcontainers.Images;
 global using JetBrains.Annotations;
 global using Microsoft.Extensions.Logging;

src/Testcontainers.ActiveMq/ArtemisBuilder.cs

@@ -35,9 +35,8 @@ public ArtemisBuilder()
     /// Docker image tags available at <see href="https://hub.docker.com/r/apache/activemq-artemis/tags" />.
     /// </remarks>
     public ArtemisBuilder(string image)
-        : this(new ActiveMqConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Testcontainers.ArangoDb/ArangoDbBuilder.cs

@@ -33,9 +33,8 @@ public ArangoDbBuilder()
     /// Docker image tags available at <see href="https://hub.docker.com/_/arangodb/tags" />.
     /// </remarks>
     public ArangoDbBuilder(string image)
-        : this(new ArangoDbConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Testcontainers.Azurite/AzuriteBuilder.cs

@@ -46,9 +46,8 @@ public AzuriteBuilder()
     /// Docker image tags available at <see href="https://hub.docker.com/r/microsoft/azure-storage-azurite/tags" />.
     /// </remarks>
     public AzuriteBuilder(string image)
-        : this(new AzuriteConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Testcontainers.BigQuery/BigQueryBuilder.cs

@@ -31,9 +31,8 @@ public BigQueryBuilder()
     /// Docker image tags available at <see href="https://github.com/goccy/bigquery-emulator/pkgs/container/bigquery-emulator" />.
     /// </remarks>
     public BigQueryBuilder(string image)
-        : this(new BigQueryConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Testcontainers.Bigtable/BigtableBuilder.cs

@@ -29,9 +29,8 @@ public BigtableBuilder()
     /// Docker image tags available at <see href="https://console.cloud.google.com/artifacts/docker/google.com:cloudsdktool/us/gcr.io/google-cloud-cli" />.
     /// </remarks>
     public BigtableBuilder(string image)
-        : this(new BigtableConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Testcontainers.Cassandra/CassandraBuilder.cs

@@ -31,9 +31,8 @@ public CassandraBuilder()
     /// Docker image tags available at <see href="https://hub.docker.com/_/cassandra/tags" />.
     /// </remarks>
     public CassandraBuilder(string image)
-        : this(new CassandraConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>

src/Testcontainers.ClickHouse/ClickHouseBuilder.cs

@@ -37,9 +37,8 @@ public ClickHouseBuilder()
     /// Docker image tags available at <see href="https://hub.docker.com/_/clickhouse/tags" />.
     /// </remarks>
     public ClickHouseBuilder(string image)
-        : this(new ClickHouseConfiguration())
+        : this(new DockerImage(image))
     {
-        DockerResourceConfiguration = Init().WithImage(image).DockerResourceConfiguration;
     }
 
     /// <summary>