feat: Add Docker Engine v29 support

Author: HofmeisterAn

.devcontainer/devcontainer.json

@@ -13,8 +13,8 @@
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "moby": true
     },
-    "ghcr.io/devcontainers/features/dotnet:2.4.0": {
-      "version": "9.0",
+    "ghcr.io/devcontainers/features/dotnet:2.4.1": {
+      "version": "10.0",
       "installUsingApt": false
     }
   },

.github/workflows/test-report.yml

@@ -30,7 +30,7 @@ jobs:
           pattern: Testcontainers*
 
       - name: Publish Test Report
-        uses: dorny/test-reporter@v2.1.1
+        uses: dorny/test-reporter@v2.3.0
         with:
           name: test-report
           path: '**/*.trx'

Directory.Packages.props

@@ -5,8 +5,8 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2"/>
-        <PackageVersion Include="Docker.DotNet.Enhanced.X509" Version="3.130.0"/>
-        <PackageVersion Include="Docker.DotNet.Enhanced" Version="3.130.0"/>
+        <PackageVersion Include="Docker.DotNet.Enhanced.X509" Version="3.131.1"/>
+        <PackageVersion Include="Docker.DotNet.Enhanced" Version="3.131.1"/>
         <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
         <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
         <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"/>

build/Tasks.cs

@@ -16,7 +16,9 @@ public void DotNetTest(SolutionProject project)
             Filter = Parameters.TestFilter,
             ResultsDirectory = Parameters.Paths.Directories.TestResultsDirectoryPath,
             ArgumentCustomization = args => args
-                .AppendSwitchQuoted("--blame-hang-timeout", "5m"),
+                // The windows-2025 GH-hosted runner no longer has cached images. Pulling the
+                // servercore:ltsc2025 image takes significantly longer.
+                .AppendSwitchQuoted("--blame-hang-timeout", "10m"),
         });
     }
 }

src/Testcontainers/Clients/ContainerConfigurationConverter.cs

@@ -97,7 +97,8 @@ public ToNetworks(IContainerConfiguration configuration)
 
       public override IEnumerable<KeyValuePair<string, EndpointSettings>> Convert([CanBeNull] IEnumerable<INetwork> source)
       {
-        return source?.Select(network => new KeyValuePair<string, EndpointSettings>(network.Name, new EndpointSettings { Aliases = _configuration.NetworkAliases?.ToList() }));
+        var endpointSettings = new EndpointSettings { Aliases = _configuration.NetworkAliases?.ToList(), MacAddress = _configuration.MacAddress };
+        return source?.Select(network => new KeyValuePair<string, EndpointSettings>(network.Name, endpointSettings));
       }
     }
 

src/Testcontainers/Clients/DockerContainerOperations.cs

@@ -204,7 +204,6 @@ public async Task<string> RunAsync(IContainerConfiguration configuration, Cancel
         Image = configuration.Image.FullName,
         Name = configuration.Name,
         Hostname = configuration.Hostname,
-        MacAddress = configuration.MacAddress,
         WorkingDir = configuration.WorkingDirectory,
         Entrypoint = converter.Entrypoint,
         Cmd = converter.Command,

src/Testcontainers/Clients/TraceProgress.cs

@@ -1,6 +1,7 @@
 namespace DotNet.Testcontainers.Clients
 {
   using System;
+  using System.Text.Json;
   using Docker.DotNet.Models;
   using Microsoft.Extensions.Logging;
 
@@ -15,29 +16,40 @@ public TraceProgress(ILogger logger)
 
     public void Report(JSONMessage value)
     {
-#pragma warning disable CA1848, CA2254
+      if (value.Error != null)
+      {
+        _logger.LogError("ID={ID}: {Error}", value.ID, value.Error.Message);
+        return;
+      }
 
-      if (!string.IsNullOrWhiteSpace(value.Status))
+      if (!_logger.IsEnabled(LogLevel.Debug))
       {
-        _logger.LogDebug(value.Status.TrimEnd());
+        return;
       }
 
       if (!string.IsNullOrWhiteSpace(value.Stream))
       {
-        _logger.LogDebug(value.Stream.TrimEnd());
+        _logger.LogDebug("{Stream}", value.Stream.Trim());
+        return;
       }
 
-      if (!string.IsNullOrWhiteSpace(value.ProgressMessage))
+      if (value.Progress != null && value.Progress.Total > 0)
       {
-        _logger.LogDebug(value.ProgressMessage.TrimEnd());
+        var percentage = (double)value.Progress.Current / value.Progress.Total * 100;
+        _logger.LogDebug("ID={ID}: {Status} {Percentage,6:F2}% ({Current}/{Total})", value.ID, value.Status, percentage, value.Progress.Current, value.Progress.Total);
+        return;
       }
 
-      if (!string.IsNullOrWhiteSpace(value.ErrorMessage))
+      if (!string.IsNullOrWhiteSpace(value.Status))
       {
-        _logger.LogError(value.ErrorMessage.TrimEnd());
+        _logger.LogDebug("ID={ID}: {Status}", value.ID, value.Status);
+        return;
       }
 
-#pragma warning restore CA1848, CA2254
+      if (value.Aux != null)
+      {
+        _logger.LogDebug("Auxiliary data: {ExtensionData}", JsonSerializer.Serialize(value.Aux.ExtensionData));
+      }
     }
   }
 }

src/Testcontainers/Configurations/AuthConfigs/DockerEndpointAuthenticationConfiguration.cs

@@ -20,7 +20,7 @@ namespace DotNet.Testcontainers.Configurations
     // class or stop exposing the `TestcontainersSettings` properties publicly.
     // Instead, we could rely only on custom configurations via environment variables
     // or the properties file.
-    private static readonly TimeSpan NamedPipeConnectionTimeout = EnvironmentConfiguration.Instance.GetNamedPipeConnectionTimeout() ?? PropertiesFileConfiguration.Instance.GetNamedPipeConnectionTimeout() ?? TimeSpan.FromSeconds(1);
+    private static readonly TimeSpan NamedPipeConnectionTimeout = EnvironmentConfiguration.Instance.GetNamedPipeConnectionTimeout() ?? PropertiesFileConfiguration.Instance.GetNamedPipeConnectionTimeout() ?? TimeSpan.FromSeconds(5);
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DockerEndpointAuthenticationConfiguration" /> struct.

src/Testcontainers/Containers/ExecResult.cs

@@ -14,7 +14,7 @@ public readonly struct ExecResult
     /// <param name="stdout">The stdout output.</param>
     /// <param name="stderr">The stderr output.</param>
     /// <param name="exitCode">The exit code.</param>
-    public ExecResult(string stdout, string stderr, long exitCode)
+    public ExecResult(string stdout, string stderr, long? exitCode)
     {
       Stdout = stdout;
       Stderr = stderr;
@@ -37,6 +37,6 @@ public ExecResult(string stdout, string stderr, long exitCode)
     /// Gets the exit code.
     /// </summary>
     [PublicAPI]
-    public long ExitCode { get; }
+    public long? ExitCode { get; }
   }
 }

tests/Testcontainers.Commons/CommonImages.cs

@@ -15,5 +15,5 @@ public static class CommonImages
 
     public static readonly IImage Nginx = new DockerImage("nginx:1.22");
 
-    public static readonly IImage ServerCore = new DockerImage("mcr.microsoft.com/windows/servercore:ltsc2022");
+    public static readonly IImage ServerCore = new DockerImage("mcr.microsoft.com/windows/servercore:ltsc2025");
 }