testcontainers · bruegth · Oct 8, 2025 · Oct 8, 2025 · Oct 8, 2025 · Oct 10, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
+    services:
+      # Docker without TLS (plain TCP) !DEPRECATED! with next docker release
+      docker-no-tls:
+        image: docker:28.1-dind
+        env:
+          DOCKER_TLS_CERTDIR: ""
+        ports:
+          - 2375:2375
+        options: >-
+          --privileged
+
+      # Docker with TLS (secure TCP)
+      docker-tls:
+        image: docker:28.1-dind
+        env:
+          DOCKER_TLS_CERTDIR: /certs
+        ports:
+          - 2376:2376
+        options: >-
+          --privileged
+        volumes:
+          - ${{ github.workspace }}/certs:/certs
+
     strategy:
       matrix:
         framework:
@@ -16,12 +39,53 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          path: test
           fetch-depth: 0
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.x
       - name: Build
         run: dotnet build -c Release --framework ${{ matrix.framework }}
+        working-directory: test
+
+      - name: Pack client cert, key, ca for C# docker client
+        run: |
+          mkdir -p ${{ github.workspace }}/certs
+          sudo chmod 777 ${{ github.workspace }}/certs
+
+          # create pfx
+          openssl pkcs12 -export -out ${{ github.workspace }}/certs/client.pfx -inkey ${{ github.workspace }}/certs/client/key.pem -in ${{ github.workspace }}/certs/client/cert.pem -certfile ${{ github.workspace }}/certs/client/ca.pem -passout pass:
+
+      - name: Wait for Docker (no TLS) to be healthy
+        run: |
+          for i in {1..10}; do
+            if docker --host=tcp://localhost:2375 version; then
+              echo "Docker (no TLS) is ready!"
+              exit 0
+            fi
+            echo "Waiting for Docker (no TLS) to be ready..."
+            sleep 3
+          done
+          echo "Docker (no TLS) did not become ready in time."
+          exit 1
+
+      - name: Wait for Docker (with TLS) to be healthy
+        run: |
+          for i in {1..10}; do
+            if docker --host=tcp://localhost:2376 --tlsverify \
+              --tlscacert=${{ github.workspace }}/certs/client/ca.pem \
+              --tlscert=${{ github.workspace }}/certs/client/cert.pem \
+              --tlskey=${{ github.workspace }}/certs/client/key.pem version; then
+              echo "Docker (TLS) is ready!"
+              exit 0
+            fi
+            echo "Waiting for Docker (TLS) to be ready..."
+            sleep 3
+          done
+          echo "Docker (TLS) did not become ready in time."
+          exit 1
+
       - name: Test
         run: dotnet test -c Release --framework ${{ matrix.framework }} --no-build --logger console
+        working-directory: test
diff --git a/Docker.DotNet.sln b/Docker.DotNet.sln
@@ -15,6 +15,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.X509", "src\D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.Tests", "test\Docker.DotNet.Tests\Docker.DotNet.Tests.csproj", "{248C5D51-2B33-4A06-A0EA-AA709F752E52}"
 EndProject
+Project("{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}") = "Docker.DotNet.NPipe", "src\Docker.DotNet.NPipe\Docker.DotNet.NPipe.csproj", "{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}"
+EndProject
+Project("{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}") = "Docker.DotNet.Unix", "src\Docker.DotNet.Unix\Docker.DotNet.Unix.csproj", "{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}"
+EndProject
+Project("{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}") = "Docker.DotNet.LegacyHttp", "src\Docker.DotNet.LegacyHttp\Docker.DotNet.LegacyHttp.csproj", "{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}"
+EndProject
+Project("{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}") = "Docker.DotNet.NativeHttp", "src\Docker.DotNet.NativeHttp\Docker.DotNet.NativeHttp.csproj", "{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}"
+EndProject
+
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,6 +34,66 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Debug|x86.Build.0 = Debug|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Release|x64.Build.0 = Release|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE}.Release|x86.Build.0 = Release|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Release|x64.Build.0 = Release|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF}.Release|x86.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Debug|x86.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Release|x64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB}.Release|x86.Build.0 = Release|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Release|x64.Build.0 = Release|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC}.Release|x86.Build.0 = Release|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Release|x64.Build.0 = Release|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3D4E5F6-A7B8-49C0-1D2E-3456789012CD}.Release|x86.Build.0 = Release|Any CPU
 		{C2EA98A7-FC7A-4EA6-A316-562A832D3D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2EA98A7-FC7A-4EA6-A316-562A832D3D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2EA98A7-FC7A-4EA6-A316-562A832D3D9A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -78,9 +147,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{D4E5F6A7-B8C9-40D1-2E3F-4567890123DE} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
+		{E5F6A7B8-C9D0-41E2-3F45-5678901234EF} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
 		{C2EA98A7-FC7A-4EA6-A316-562A832D3D9A} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
 		{E1F24B25-E027-45E0-A6E1-E08138F1F95D} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
 		{89BD76AD-78C9-4E4A-96A2-E5DA6D4AFA44} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
+		{A1B2C3D4-E5F6-47A8-9B0C-1234567890AB} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
+		{B2C3D4E5-F6A7-48B9-0C1D-2345678901BC} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
 		{248C5D51-2B33-4A06-A0EA-AA709F752E52} = {AA4B8CC2-1431-4FC7-9DF3-533EC6C86D3A}
 	EndGlobalSection
 EndGlobal
diff --git a/README.md b/README.md
@@ -19,7 +19,9 @@ You can add this library to your project using [NuGet][nuget].
 
 Run the following command in the "Package Manager Console":
 
+```console
 > PM> Install-Package Docker.DotNet.Enhanced
+```
 
 **Visual Studio**
 
@@ -29,47 +31,76 @@ Right click to your project in Visual Studio, choose "Manage NuGet Packages" and
 
 Run the following command from your favorite shell or terminal:
 
+```console
 > dotnet add package Docker.DotNet.Enhanced
+```
 
 **Development Builds**
 
 [![CI](https://github.com/testcontainers/Docker.DotNet/actions/workflows/ci.yml/badge.svg)](https://github.com/testcontainers/Docker.DotNet/actions/workflows/ci.yml)
 
 ## Usage
 
-You can initialize the client like the following:
+You can initialize the client as follows:
 
 ```csharp
 using Docker.DotNet;
 DockerClient client = new DockerClientConfiguration(
     new Uri("http://ubuntu-docker.cloudapp.net:4243"))
-        .CreateClient();
+    .CreateClient();
 ```
 
-or to connect to your local [Docker Desktop on Windows](https://docs.docker.com/desktop/setup/install/windows-install/) daemon using named pipes or your local [Docker Desktop on Mac](https://docs.docker.com/desktop/setup/install/mac-install/) daemon using Unix sockets:
+### Connection types and optional sub-packages
 
-```csharp
-using Docker.DotNet;
-DockerClient client = new DockerClientConfiguration()
-    .CreateClient();
+Depending on the connection scheme and platform, additional sub-packages may be required:
+
+- **Docker.DotNet.Enhanced.NPipe**: Support for named pipes on Windows (`npipe://`).
+- **Docker.DotNet.Enhanced.Unix**: Support for Unix domain sockets on Linux/macOS (`unix://`).
+- **Docker.DotNet.Enhanced.NativeHttp**: Native HTTP handler for specific platforms/scenarios.
+- **Docker.DotNet.Enhanced.LegacyHttp**: Legacy HTTP handler for compatibility with older .NET versions.
+
+These packages are optional and only needed if you want to use the respective protocol or handler. You can install them via NuGet, for example:
+
+```console
+PM> Install-Package Docker.DotNet.Enhanced.NPipe
+PM> Install-Package Docker.DotNet.Enhanced.Unix
+PM> Install-Package Docker.DotNet.Enhanced.NativeHttp
+PM> Install-Package Docker.DotNet.Enhanced.LegacyHttp
 ```
 
-For a custom endpoint, you can also pass a named pipe or a Unix socket to the `DockerClientConfiguration` constructor. For example:
+**Examples:**
+
+**Named Pipe (Windows):**
 
 ```csharp
-// Default Docker Engine on Windows
 using Docker.DotNet;
 DockerClient client = new DockerClientConfiguration(
     new Uri("npipe://./pipe/docker_engine"))
-        .CreateClient();
+    .CreateClient();
+```
+
+**Unix Domain Socket (Linux/macOS):**
 
-// Default Docker Engine on Linux
+```csharp
 using Docker.DotNet;
 DockerClient client = new DockerClientConfiguration(
     new Uri("unix:///var/run/docker.sock"))
-        .CreateClient();
+    .CreateClient();
+```
+
+**Note:**
+For HTTP(S) connections or special authentication types (e.g. X509, BasicAuth), see the corresponding sections below.
+
+To connect to your local [Docker Desktop on Windows](https://docs.docker.com/desktop/setup/install/windows-install/) instance via named pipe or your local [Docker Desktop on Mac](https://docs.docker.com/desktop/setup/install/mac-install/) instance via Unix socket:
+
+```csharp
+using Docker.DotNet;
+DockerClient client = new DockerClientConfiguration()
+    .CreateClient();
 ```
 
+For a custom endpoint, you can also explicitly pass a named pipe or Unix socket to the `DockerClientConfiguration` constructor (see examples above).
+
 #### Example: List containers
 
 ```csharp
@@ -173,7 +204,9 @@ You can cancel streaming using the cancellation token. Or, if you wish to contin
 
 If you are [running Docker with TLS (HTTPS)][docker-tls], you can authenticate to the Docker instance using the [**`Docker.DotNet.Enhanced.X509`**][Docker.DotNet.X509] package. You can get this package from NuGet or by running the following command in the "Package Manager Console":
 
+```console
     PM> Install-Package Docker.DotNet.Enhanced.X509
+```
 
 Once you add `Docker.DotNet.Enhanced.X509` to your project, use the `CertificateCredentials` type:
 
@@ -187,7 +220,9 @@ If you don't want to authenticate you can omit the `credentials` parameter, whic
 
 The `CertFile` in the example above should be a PFX file (PKCS12 format), if you have PEM formatted certificates which Docker normally uses you can either convert it programmatically or use `openssl` tool to generate a PFX:
 
+```console
     openssl pkcs12 -export -inkey key.pem -in cert.pem -out key.pfx
+```
 
 (Here, your private key is `key.pem`, public key is `cert.pem` and output file is named `key.pfx`.) This will prompt a password for PFX file and then you can use this PFX file on Windows. If the certificate is self-signed, your application may reject the server certificate, in this case you might want to disable server certificate validation:
 
@@ -200,7 +235,9 @@ credentials.ServerCertificateValidationCallback = (o, c, ch, er) => true;
 
 If the Docker instance is secured with "Basic" HTTP authentication, you can use the [**`Docker.DotNet.Enhanced.BasicAuth`**][Docker.DotNet.BasicAuth] package. Get this package from NuGet or by running the following command in the "Package Manager Console":
 
+```console
     PM> Install-Package Docker.DotNet.Enhanced.BasicAuth
+```
 
 Once you added `Docker.DotNet.Enhanced.BasicAuth` to your project, use `BasicAuthCredentials` type:
 
@@ -226,13 +263,13 @@ DockerClient client = config.CreateClient(new Version(1, 49));
 
 Here are typical exceptions thrown from the client library:
 
-* **`DockerApiException`** is thrown when Docker Engine API responds with a non-success result. Subclasses:
-    * **``DockerContainerNotFoundException``**
-    * **``DockerImageNotFoundException``**
-* **`TaskCanceledException`** is thrown from `System.Net.Http.HttpClient` library by design. It is not a friendly exception, but it indicates your request has timed out. (default request timeout is 100 seconds.)
-    * Long-running methods (e.g. `WaitContainerAsync`, `StopContainerAsync`) and methods that return Stream (e.g. `CreateImageAsync`, `GetContainerLogsAsync`) have timeout value overridden with infinite timespan by this library.
-* **`ArgumentNullException`** is thrown when one of the required parameters are missing/empty.
-    * Consider reading the [Docker Remote API reference][docker-remote-api] and source code of the corresponding method you are going to use in from this library. This way you can easily find out which parameters are required and their format.
+- **`DockerApiException`** is thrown when Docker Engine API responds with a non-success result. Subclasses:
+  - **`DockerContainerNotFoundException`**
+  - **`DockerImageNotFoundException`**
+- **`TaskCanceledException`** is thrown from `System.Net.Http.HttpClient` library by design. It is not a friendly exception, but it indicates your request has timed out. (default request timeout is 100 seconds.)
+  - Long-running methods (e.g. `WaitContainerAsync`, `StopContainerAsync`) and methods that return Stream (e.g. `CreateImageAsync`, `GetContainerLogsAsync`) have timeout value overridden with infinite timespan by this library.
+- **`ArgumentNullException`** is thrown when one of the required parameters are missing/empty.
+  - Consider reading the [Docker Remote API reference][docker-remote-api] and source code of the corresponding method you are going to use in from this library. This way you can easily find out which parameters are required and their format.
 
 ## License
 

diff --git a/src/Docker.DotNet.LegacyHttp/Docker.DotNet.LegacyHttp.csproj b/src/Docker.DotNet.LegacyHttp/Docker.DotNet.LegacyHttp.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>Docker.DotNet.LegacyHttp</AssemblyName>
+    <PackageId>Docker.DotNet.LegacyHttp</PackageId>
+    <Description>Docker.DotNet.LegacyHttp is a library that allows you to connect via http(s) with a Docker engine programmatically in your .NET applications.</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Docker.DotNet\Docker.DotNet.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Using Include="System" />
+    <Using Include="System.Net.Http" />
+    <Using Include="System.Net.Http.Headers" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Security" />
+    <Using Include="System.Text" />
+    <Using Include="System.Threading" />
+    <Using Include="System.Threading.Tasks" />
+  </ItemGroup>
+</Project>
diff --git a/src/Docker.DotNet.LegacyHttp/LegacyHttpHandlerFactory.cs b/src/Docker.DotNet.LegacyHttp/LegacyHttpHandlerFactory.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Docker.DotNet.LegacyHttp
+{
+    public class LegacyHttpHandlerFactory : IDockerHandlerFactory
+    {
+        public Tuple<HttpMessageHandler, Uri> CreateHandler(Uri uri, DockerClientConfiguration configuration, ILogger logger)
+        {
+            var builder = new UriBuilder(uri)
+            {
+                    Scheme = configuration.Credentials.IsTlsCredentials() ? "https" : "http"
+            };
+            uri = builder.Uri;
+            return new Tuple<HttpMessageHandler, Uri>(
+                new Microsoft.Net.Http.Client.ManagedHandler(logger),
+                uri
+            );
+        }
+    }
+}
diff --git a/...oft.Net.Http.Client/BufferedReadStream.cs → ...oft.Net.Http.Client/BufferedReadStream.cs b/...oft.Net.Http.Client/BufferedReadStream.cs → ...oft.Net.Http.Client/BufferedReadStream.cs
@@ -1,3 +1,9 @@
+using System.Buffers;
+using System.IO;
+using System.Net.Sockets;
+using Docker.DotNet;
+using Microsoft.Extensions.Logging;
+
 namespace Microsoft.Net.Http.Client;
 
 internal sealed class BufferedReadStream : WriteClosableStream, IPeekableStream

diff --git a/...soft.Net.Http.Client/ChunkedReadStream.cs → ...soft.Net.Http.Client/ChunkedReadStream.cs b/...soft.Net.Http.Client/ChunkedReadStream.cs → ...soft.Net.Http.Client/ChunkedReadStream.cs
@@ -1,3 +1,6 @@
+using System.Globalization;
+using System.IO;
+
 namespace Microsoft.Net.Http.Client;
 
 internal sealed class ChunkedReadStream : Stream

diff --git a/...oft.Net.Http.Client/ChunkedWriteStream.cs → ...oft.Net.Http.Client/ChunkedWriteStream.cs b/...oft.Net.Http.Client/ChunkedWriteStream.cs → ...oft.Net.Http.Client/ChunkedWriteStream.cs
@@ -1,3 +1,5 @@
+using System.IO;
+
 namespace Microsoft.Net.Http.Client;
 
 internal sealed class ChunkedWriteStream : Stream