brister/jsmr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Updated MariaDbContainerFixture building process.
Some checks failed
ci / build-test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Brian Bicknell
2025-11-02 09:34:25 -05:00
parent 23d3280962
commit b06eadef1d
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
JSMR.Tests/Fixtures/MariaDbFixture.cs
View File

@@ -19,7 +19,7 @@ public sealed class MariaDbContainerFixture : IAsyncLifetime
const int MinorVersion = 11; const int MinorVersion = 11;
const int Build = 6; const int Build = 6;
private IContainer _container = default!; private MariaDbContainer _container = default!;
public string RootConnectionString { get; private set; } = default!; public string RootConnectionString { get; private set; } = default!;
public async ValueTask InitializeAsync() public async ValueTask InitializeAsync()
@@ -31,22 +31,31 @@ public sealed class MariaDbContainerFixture : IAsyncLifetime
// .WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(3306)) // .WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(3306))
// .Build(); // .Build();
_container = new ContainerBuilder() //_container = new ContainerBuilder()
.WithImage($"mariadb:{MajorVersion}.{MinorVersion}.{Build}") // .WithImage($"mariadb:{MajorVersion}.{MinorVersion}.{Build}")
.WithEnvironment("MARIADB_ROOT_PASSWORD", "rootpw") // .WithEnvironment("MARIADB_ROOT_PASSWORD", "rootpw")
//.WithPortBinding(3307, 3306) // //.WithPortBinding(3307, 3306)
.WithPortBinding(3306, assignRandomHostPort: true) // .WithPortBinding(3306, assignRandomHostPort: true)
.WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(3306)) // .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(3306))
.Build(); // .Build();
_container = new MariaDbBuilder()
.WithImage($"mariadb:{MajorVersion}.{MinorVersion}.{Build}")
.WithEnvironment("MARIADB_ROOT_PASSWORD", "rootpw")
.WithUsername("root")
.WithPassword("rootpw")
// no explicit port binding
.WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(3306))
.Build();
await _container.StartAsync(); await _container.StartAsync();
// No database specified: we’ll create per-test DBs // No database specified: we’ll create per-test DBs
//RootConnectionString = "Server=127.0.0.1;Port=3307;User=root;Password=rootpw;SslMode=none;"; //RootConnectionString = "Server=127.0.0.1;Port=3307;User=root;Password=rootpw;SslMode=none;";
//RootConnectionString = _container.GetConnectionString(); RootConnectionString = _container.GetConnectionString();
var port = _container.GetMappedPublicPort(3306); var port = _container.GetMappedPublicPort(3306);
RootConnectionString = $"Server=127.0.0.1;Port={port};User=root;Password=rootpw;SslMode=none;"; //RootConnectionString = $"Server=127.0.0.1;Port={port};User=root;Password=rootpw;SslMode=none;";
} }
public async ValueTask DisposeAsync() => await _container.DisposeAsync(); public async ValueTask DisposeAsync() => await _container.DisposeAsync();