Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@
this.ImageDetails.Add(ContainerType.FileProcessor, ("stuartferguson/fileprocessor:master", true));
this.ImageDetails.Add(ContainerType.TransactionProcessorAcl, ("stuartferguson/transactionprocessoracl:master", true));
this.ImageDetails.Add(ContainerType.ConfigurationHost, ("stuartferguson/mobileconfiguration:master", true));
this.ImageDetails.Add(ContainerType.EstateManagementUI, ("stuartferguson/estatemanagementui:latest", true));
this.ImageDetails.Add(ContainerType.EstateReporting, ("stuartferguson/estatereportingapi:latest", true));
this.ImageDetails.Add(ContainerType.EstateManagementUI, ("stuartferguson/estatemanagementui:master", true));
this.ImageDetails.Add(ContainerType.EstateReporting, ("stuartferguson/estatereportingapi:master", true));
}

this.HostPorts = new Dictionary<ContainerType, Int32>();
Expand All @@ -171,7 +171,7 @@
public virtual Dictionary<String,String> GetAdditionalVariables(ContainerType containerType){
Dictionary<String, String> result = new();

Dictionary<String, String>? additional = this.AdditionalVariables.SingleOrDefault(a => a.Key == containerType).Value;

Check warning on line 174 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
if (additional != null){
foreach (KeyValuePair<String, String> item in additional) {
result.Add(item.Key, item.Value);
Expand Down Expand Up @@ -212,7 +212,7 @@
Docker.DotNet.DockerClientBuilder b = new DockerClientBuilder();
DockerClient docker = b.Build();

SystemInfoResponse? info = await docker.System.GetSystemInfoAsync();

Check warning on line 215 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

return info.OSType switch {
"linux" => Result.Success(DockerEnginePlatform.Linux),
Expand Down Expand Up @@ -296,7 +296,7 @@

(String imageName, Boolean useLatest) imageDetails = this.GetImageDetails(ContainerType.CallbackHandler).Data;

ContainerBuilder callbackHandlerContainer = new ContainerBuilder()

Check warning on line 299 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

'ContainerBuilder.ContainerBuilder()' is obsolete: 'This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.'
.WithName(this.CallbackHandlerContainerName) // similar to WithName()
.WithImage(imageDetails.imageName)
.WithEnvironment(environmentVariables)
Expand Down Expand Up @@ -336,7 +336,7 @@
{"EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP","true"},
{"EVENTSTORE_PROJECTION_EXECUTION_TIMEOUT","5000"}
};
ContainerBuilder eventStoreContainer = new ContainerBuilder();

Check warning on line 339 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

'ContainerBuilder.ContainerBuilder()' is obsolete: 'This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.'

if (!this.IsSecureEventStore){
environmentVariables.Add("EVENTSTORE_INSECURE","true");
Expand Down Expand Up @@ -432,7 +432,7 @@

(String imageName, Boolean useLatest) imageDetails = this.GetImageDetails(ContainerType.FileProcessor).Data;

ContainerBuilder fileProcessorContainer = new ContainerBuilder()

Check warning on line 435 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

'ContainerBuilder.ContainerBuilder()' is obsolete: 'This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.'
.WithName(this.FileProcessorContainerName) // similar to WithName()
.WithImage(imageDetails.imageName)
.WithEnvironment(environmentVariables)
Expand Down Expand Up @@ -482,7 +482,7 @@

(String imageName, Boolean useLatest) imageDetails = this.GetImageDetails(ContainerType.EstateManagementUI).Data;

ContainerBuilder containerBuilder = new ContainerBuilder()

Check warning on line 485 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

'ContainerBuilder.ContainerBuilder()' is obsolete: 'This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.'
.WithName(this.EstateManagementUiContainerName)
.WithImage(imageDetails.imageName)
.WithEnvironment(environmentVariables)
Expand All @@ -500,7 +500,7 @@

(String imageName, Boolean useLatest) imageDetails = this.GetImageDetails(ContainerType.ConfigurationHost).Data;

ContainerBuilder configHostContainer = new ContainerBuilder().WithName(this.ConfigHostContainerName)

Check warning on line 503 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

'ContainerBuilder.ContainerBuilder()' is obsolete: 'This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.'
.WithImage(imageDetails.imageName)
.WithEnvironment(environmentVariables)
.MountHostFolder(this.DockerPlatform, this.HostTraceFolder)
Expand All @@ -527,7 +527,7 @@

(String imageName, Boolean useLatest) imageDetails = this.GetImageDetails(ContainerType.MessagingService).Data;

ContainerBuilder messagingServiceContainer = new ContainerBuilder().WithName(this.MessagingServiceContainerName) // similar to WithName()

Check warning on line 530 in Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

'ContainerBuilder.ContainerBuilder()' is obsolete: 'This parameterless constructor is obsolete and will be removed. Use the constructor with the image parameter instead: https://github.com/testcontainers/testcontainers-dotnet/discussions/1470#discussioncomment-15185721.'
.WithImage(imageDetails.imageName).WithEnvironment(environmentVariables).MountHostFolder(this.DockerPlatform, this.HostTraceFolder).WithPortBinding(DockerPorts.MessagingServiceDockerPort, true);
//.WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(DockerPorts.MessagingServiceDockerPort));

Expand Down
Loading