Merge branch 'master' into feature/oauth

src/Infrastructure/DependencyInjection.cs

@@ -20,11 +20,14 @@ public static class DependencyInjection
     {
         // Replace password in the connection string with env var.
         var connectionString = configuration.GetConnectionString("DefaultConnection") ?? "";
+        
+        Guard.Against.Null(connectionString, message: "Connection string 'DefaultConnection' not found.");
+        
         var dbPassword = Environment.GetEnvironmentVariable("DB_PASSWORD");
+        var dbHost = Environment.GetEnvironmentVariable("DB_HOST") ?? "localhost";
 
         connectionString = connectionString.Replace("{DB_PASSWORD}", dbPassword);
-
+        connectionString = connectionString.Replace("{DB_HOST}", dbHost);
-        Guard.Against.Null(connectionString, message: "Connection string 'DefaultConnection' not found.");
 
         services.AddScoped<ISaveChangesInterceptor, AuditableEntityInterceptor>();
         services.AddScoped<ISaveChangesInterceptor, DispatchDomainEventsInterceptor>();

src/Web/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Server=localhost,1433;Database=HutopyLocal;User Id=sa;Password={DB_PASSWORD};MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server={DB_HOST},1433;Database=HutopyLocal;User Id=sa;Password={DB_PASSWORD};MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
   "Logging": {
     "LogLevel": {