Refactor Docker container management to use Testcontainers

Author: glucaci

Directory.Packages.props

@@ -50,10 +50,16 @@
 
         <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
 
-        <PackageVersion Include="Docker.DotNet.Enhanced" Version="3.131.0" />
+        <PackageVersion Include="Testcontainers" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.MongoDb" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.PostgreSql" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.Redis" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.RabbitMq" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.MySql" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.MsSql" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.Elasticsearch" Version="4.3.0" />
+        <PackageVersion Include="Testcontainers.MariaDb" Version="4.3.0" />
         <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageVersion Include="Polly" Version="8.5.2" />
-        <PackageVersion Include="SharpZipLib" Version="1.4.2" />
 
         <PackageVersion Include="MongoDB.Driver" Version="3.0.0" />
         <PackageVersion Include="MySqlConnector" Version="2.4.0" />
@@ -83,7 +89,7 @@
         <PackageVersion Include="Typesense" Version="7.33.0" />
 
         <PackageVersion Include="FluentFTP" Version="35.0.4" />
-        <PackageVersion Include="SSH.NET" Version="2023.0.0" />
+        <PackageVersion Include="SSH.NET" Version="2024.2.0" />
 
 
         <PackageVersion Include="ServiceStack.Text" Version="8.8.0" />

src/Core/ChmodCommand.cs

@@ -1,6 +1,5 @@
 
 using System;
-using Docker.DotNet.Models;
 
 namespace Squadron;
 
@@ -17,36 +16,27 @@ public static class ChmodCommand
     /// <param name="group"><see cref="Permission"/> for group</param>
     /// <param name="public"><see cref="Permission"/> for public</param>
     /// <param name="recursive">Apply recursive</param>
-    public static ContainerExecCreateParameters Set(
+    public static string[] Set(
         string pathInContainer,
         Permission owner = Permission.None,
         Permission group = Permission.None,
         Permission @public = Permission.None,
         bool recursive = false)
     {
         var cmd = $"chmod {(recursive ? "-R " : "")}{owner:d}{group:d}{@public:d} {pathInContainer}";
-
-        return new ContainerExecCreateParameters
-        {
-            AttachStderr = true,
-            AttachStdin = false,
-            AttachStdout = true,
-            Cmd = cmd.Split(' '),
-            Privileged = true,
-            User = "root"
-        };
+        return cmd.Split(' ');
     }
 
-    public static ContainerExecCreateParameters ReadOnly(string pathInContainer, bool recursive = false)
+    public static string[] ReadOnly(string pathInContainer, bool recursive = false)
         => Set(pathInContainer, Permission.Read, Permission.Read, Permission.Read, recursive);
 
-    public static ContainerExecCreateParameters FullAccess(string pathInContainer, bool recursive = false)
+    public static string[] FullAccess(string pathInContainer, bool recursive = false)
         => Set(pathInContainer, Permission.FullAccess, Permission.FullAccess, Permission.FullAccess, recursive);
 
-    public static ContainerExecCreateParameters Execute(string pathInContainer, bool recursive = false)
+    public static string[] Execute(string pathInContainer, bool recursive = false)
         => Set(pathInContainer, Permission.Execute, Permission.Execute, Permission.Execute, recursive);
 
-    public static ContainerExecCreateParameters ReadWrite(string pathInContainer, bool recursive = false)
+    public static string[] ReadWrite(string pathInContainer, bool recursive = false)
         => Set(pathInContainer, Permission.ReadWrite, Permission.ReadWrite, Permission.ReadWrite, recursive);
 
     [Flags]

src/Core/ContainerInstance.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using Docker.DotNet;
 
 namespace Squadron;
 
-/// <summary>Respresents a created docker container</summary>
+/// <summary>Represents a created docker container</summary>
 public class ContainerInstance : IDisposable
 {
     /// <summary>
@@ -67,10 +65,8 @@ public class ContainerInstance : IDisposable
     /// </value>
     public IList<string> Logs { get; set; } = new List<string>();
 
-    internal MultiplexedStream? LogStream { get; set; }
-
     public void Dispose()
     {
-        LogStream?.Dispose();
+        // No longer need to dispose log stream - Testcontainers handles this
     }
 }

src/Core/ContainerResource.cs

@@ -66,7 +66,7 @@ protected virtual void SetupContainerResource()
 
         DockerConfiguration dockerConfig = Settings.DockerConfigResolver();
 
-        Manager = new DockerContainerManager(Settings, dockerConfig);
+        Manager = new TestcontainersDockerManager(Settings, dockerConfig);
         Initializer = new ContainerInitializer(Manager, Settings);
     }
 

src/Core/Core.csproj

@@ -16,10 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Docker.DotNet.Enhanced" />
+    <PackageReference Include="Testcontainers" />
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="Polly" />
-    <PackageReference Include="SharpZipLib" />
   </ItemGroup>
 
 </Project>