diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj
index ef9dfe0..406af8c 100644
--- a/MessagingService.Client/MessagingService.Client.csproj
+++ b/MessagingService.Client/MessagingService.Client.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
index 5a1586c..735fcd9 100644
--- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
+++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
index 129dabd..a7739c1 100644
--- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
+++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
index 32fd8f7..42a92ed 100644
--- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
+++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs
index e72f658..645485f 100644
--- a/MessagingService.IntegrationTests/Common/DockerHelper.cs
+++ b/MessagingService.IntegrationTests/Common/DockerHelper.cs
@@ -129,12 +129,14 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
this.EventStoreContainerName = $"eventstore{testGuid:N}";
this.MessagingServiceContainerName = $"messagingservice{testGuid:N}";
+ String eventStoreAddress = $"http://{this.EventStoreContainerName}";
+
(String, String, String) dockerCredentials = ("https://www.docker.com", "stuartferguson", "Sc0tland");
INetworkService testNetwork = DockerHelper.SetupTestNetwork();
this.TestNetworks.Add(testNetwork);
IContainerService eventStoreContainer =
- DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:20.6.0-buster-slim", testNetwork, traceFolder, usesEventStore2006OrLater:true);
+ DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:20.10.0-buster-slim", testNetwork, traceFolder, true);
IContainerService securityServiceContainer = DockerHelper.SetupSecurityServiceContainer(this.SecurityServiceContainerName,
this.Logger,
@@ -153,7 +155,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
traceFolder,
dockerCredentials,
this.SecurityServiceContainerName,
- this.EventStoreContainerName,
+ eventStoreAddress,
("serviceClient", "Secret1"));
this.Containers.AddRange(new List
@@ -202,46 +204,6 @@ public override async Task StopContainersForScenarioRun()
}
}
- public const int MessagingServiceDockerPort = 5006;
- public static IContainerService SetupMessagingServiceContainer(String containerName,
- ILogger logger,
- String imageName,
- List networkServices,
- String hostFolder,
- (String URL, String UserName, String Password)? dockerCredentials,
- String securityServiceContainerName,
- String eventStoreContainerName,
- (String clientId, String clientSecret) clientDetails,
- Boolean forceLatestImage = false,
- Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort)
- {
- logger.LogInformation("About to Start Messaging Service Container");
-
- List environmentVariables = new List();
- environmentVariables.Add($"EventStoreSettings:ConnectionString=https://{eventStoreContainerName}:{DockerHelper.EventStoreHttpDockerPort}");
- environmentVariables.Add($"AppSettings:SecurityService=http://{securityServiceContainerName}:{securityServicePort}");
- environmentVariables.Add($"SecurityConfiguration:Authority=http://{securityServiceContainerName}:{securityServicePort}");
- environmentVariables.Add($"urls=http://*:{DockerHelper.MessagingServiceDockerPort}");
- environmentVariables.Add("AppSettings:EmailProxy=Integration");
- environmentVariables.Add("AppSettings:SMSProxy=Integration");
-
- ContainerBuilder messagingServiceContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
- .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.MessagingServiceDockerPort)
- .UseNetwork(networkServices.ToArray()).Mount(hostFolder, "/home", MountType.ReadWrite);
-
- if (dockerCredentials.HasValue)
- {
- messagingServiceContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
- }
-
- // Now build and return the container
- IContainerService builtContainer = messagingServiceContainer.Build().Start().WaitForPort($"{DockerHelper.MessagingServiceDockerPort}/tcp", 30000);
-
- logger.LogInformation("Messaging Service Container Started");
-
- return builtContainer;
- }
-
#endregion
}
}
\ No newline at end of file
diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
index f052d5f..e189cbc 100644
--- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
+++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
@@ -7,11 +7,11 @@
-
+
-
+
diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
index d85afbc..d7a3990 100644
--- a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
+++ b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
index 1098d5a..176dd32 100644
--- a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
+++ b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj
index 3be6ae5..47a8de1 100644
--- a/MessagingService/MessagingService.csproj
+++ b/MessagingService/MessagingService.csproj
@@ -11,7 +11,7 @@
-
+