Skip to content

Commit 26c4892

Browse files
authored
Merge branch 'testcontainers:develop' into ssl-config-dotnet
2 parents b288bc1 + 3b4f418 commit 26c4892

32 files changed

Lines changed: 320 additions & 29 deletions

.gitattributes

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
# Shell scripts
99
*.sh text eol=lf
1010

11-
# Git lfs
12-
*.crt filter=lfs diff=lfs merge=lfs -text
11+
# Treat all SSL-related files as binary
12+
*.crt binary
13+
*.key binary
14+
*.pem binary
15+
*.pfx binary
16+
17+
# Git LFS
1318
*.ico filter=lfs diff=lfs merge=lfs -text
19+
*.pfx filter=lfs diff=lfs merge=lfs -text
1420
*.png filter=lfs diff=lfs merge=lfs -text
1521
*.snk filter=lfs diff=lfs merge=lfs -text
1622

.github/workflows/test-report.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ on:
88
- completed
99

1010
jobs:
11-
report:
11+
test-report:
1212
permissions:
13-
actions: read
1413
checks: write
15-
contents: read
1614

1715
runs-on: ubuntu-24.04
1816

@@ -38,5 +36,6 @@ jobs:
3836
path: '**/*.trx'
3937
reporter: dotnet-trx
4038
only-summary: true
39+
use-actions-summary: false
4140
list-suites: failed
4241
list-tests: failed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ ClientBin/
242242
*.dbmdl
243243
*.dbproj.schemaview
244244
*.jfm
245-
*.pfx
246245
*.publishsettings
247246
orleans.codegen.cs
248247

@@ -402,4 +401,4 @@ FodyWeavers.xsd
402401

403402
# JetBrains Rider
404403
.idea/
405-
*.sln.iml
404+
*.sln.iml

docs/api/create_docker_container.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ To configure an ASP.NET Core application, either one or both mechanisms can be u
2727
```csharp
2828
_ = new ContainerBuilder()
2929
.WithEnvironment("ASPNETCORE_URLS", "https://+")
30-
.WithEnvironment("ASPNETCORE_Kestrel__Certificates__Default__Path", "/app/certificate.crt")
30+
.WithEnvironment("ASPNETCORE_Kestrel__Certificates__Default__Path", "/app/certificate.pfx")
3131
.WithEnvironment("ASPNETCORE_Kestrel__Certificates__Default__Password", "password")
32-
.WithResourceMapping("certificate.crt", "/app/");
32+
.WithResourceMapping("certificate.pfx", "/app/");
3333
```
3434

3535
`WithBindMount(string, string)` is another option to provide access to directories or files. It mounts a host directory or file into the container. Note, this does not follow our best practices. Host paths differ between environments and may not be available on every system or Docker setup, e.g. CI.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
* text=auto
2-
*.crt filter=lfs diff=lfs merge=lfs -text
2+
*.pfx filter=lfs diff=lfs merge=lfs -text

examples/WeatherForecast/src/WeatherForecast/WeatherForecast.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<InternalsVisibleTo Include="WeatherForecast.InProcess.Test"/>
1818
</ItemGroup>
1919
<ItemGroup>
20-
<None Update="certificate.crt" Visible="false">
20+
<None Update="certificate.pfx" Visible="false">
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
</None>
2323
</ItemGroup>

examples/WeatherForecast/src/WeatherForecast/certificate.crt renamed to examples/WeatherForecast/src/WeatherForecast/certificate.pfx

File renamed without changes.

examples/WeatherForecast/tests/WeatherForecast.Tests/WeatherForecastImage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public sealed class WeatherForecastImage : IImage, IAsyncLifetime
55
{
66
public const ushort HttpsPort = 443;
77

8-
public const string CertificateFilePath = "certificate.crt";
8+
public const string CertificateFilePath = "certificate.pfx";
99

1010
public const string CertificatePassword = "password";
1111

src/Testcontainers.Weaviate/WeaviateContainer.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@ namespace Testcontainers.Weaviate;
22

33
/// <inheritdoc cref="DockerContainer" />
44
[PublicAPI]
5-
public sealed class WeaviateContainer(WeaviateConfiguration configuration) : DockerContainer(configuration)
5+
public sealed class WeaviateContainer : DockerContainer
66
{
7+
/// <summary>
8+
/// Initializes a new instance of the <see cref="WeaviateContainer" /> class.
9+
/// </summary>
10+
/// <param name="configuration">The container configuration.</param>
11+
public WeaviateContainer(WeaviateConfiguration configuration)
12+
: base(configuration)
13+
{
14+
}
15+
716
/// <summary>
817
/// Gets the Weaviate base address.
918
/// </summary>

src/Testcontainers.Xunit/ContainerFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ namespace Testcontainers.Xunit;
1111
[PublicAPI]
1212
public class ContainerFixture<TBuilderEntity, TContainerEntity>(IMessageSink messageSink)
1313
: ContainerLifetime<TBuilderEntity, TContainerEntity>(new MessageSinkLogger(messageSink))
14-
where TBuilderEntity : IContainerBuilder<TBuilderEntity, TContainerEntity>, new()
14+
where TBuilderEntity : IContainerBuilder<TBuilderEntity, TContainerEntity, IContainerConfiguration>, new()
1515
where TContainerEntity : IContainer;

0 commit comments

Comments
 (0)