Skip to content

Commit 3f86775

Browse files
committed
manual ci start
1 parent a130dca commit 3f86775

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
name: CI
22

33
on:
4-
pull_request:
5-
branches:
6-
- main
4+
workflow_dispatch:
75

86
jobs:
97
build:
10-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-latest
119
services:
1210
# Docker without TLS (plain TCP) !DEPRECATED! with next docker release
1311
docker-no-tls:

src/Docker.DotNet/Microsoft.Net.Http.Client/ManagedHandler.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,16 @@ private async Task<HttpResponseMessage> ProcessRequestAsync(HttpRequestMessage r
174174
{
175175
SslStream sslStream = new SslStream(transport, false, ServerCertificateValidationCallback);
176176
await sslStream.AuthenticateAsClientAsync(request.GetHostProperty(), ClientCertificates, SslProtocols.Tls12, false);
177-
transport = sslStream;
177+
var bufferedReadStream = new BufferedReadStream(sslStream, socket, _logger);
178+
var connection = new HttpConnection(bufferedReadStream);
179+
return await connection.SendAsync(request, cancellationToken);
180+
}
181+
else
182+
{
183+
var bufferedReadStream = new BufferedReadStream(transport, socket, _logger);
184+
var connection = new HttpConnection(bufferedReadStream);
185+
return await connection.SendAsync(request, cancellationToken);
178186
}
179-
180-
var bufferedReadStream = new BufferedReadStream(transport, socket, _logger);
181-
var connection = new HttpConnection(bufferedReadStream);
182-
return await connection.SendAsync(request, cancellationToken);
183187
}
184188

185189
// Data comes from either the request.RequestUri or from the request.Properties

test/Docker.DotNet.Tests/TestFixture.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.IO;
2+
using System.Net;
23
using System.Net.Security;
34
using System.Security.Cryptography.X509Certificates;
45
using Docker.DotNet.X509;
@@ -221,7 +222,8 @@ public static IEnumerable<object[]> GetDockerClientTypes()
221222
.Select(t => new object[] { t });
222223
}
223224

224-
return allClients.Select(t => new object[] { t });
225+
//return allClients.Select(t => new object[] { t });
226+
return allClients.Where(t => t == TestClientsEnum.ManagedHttps).Select(t => new object[] { t });
225227
}
226228

227229
public static IEnumerable<TestDaemonsEnum> GetDockerDaemonTypes()

0 commit comments

Comments
 (0)