#116 Community - Deployment setting

bartstc · Nov 15, 2021 · 9685d59 · 9685d59
1 parent 4740e0e
commit 9685d59
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/community-service/src/Community.Api/Startup.cs b/community-service/src/Community.Api/Startup.cs
@@ -51,7 +51,7 @@ public void ConfigureServices(IServiceCollection services)
 
             var applicationAssembly = typeof(CreateMemberCommand).Assembly;
 
-            if (!webHostEnvironment.IsDevelopment())
+            if (!webHostEnvironment.IsDevelopment() && Configuration["Deployment"] == "Heroku")
                 Configuration["EventStore:ConnectionString"] = GetHerokuConnectionString();
 
             services

diff --git a/community-service/src/Community.Api/appsettings.json b/community-service/src/Community.Api/appsettings.json
@@ -21,5 +21,6 @@
     "ClientId": "",
     "ClientSecret": "",
     "DatabaseConnection": ""
-  }
+  },
+  "Deployment": "None"
 }
diff --git a/docker-compose.client.yml b/docker-compose.client.yml
@@ -88,11 +88,8 @@ services:
       dockerfile: community-service/Dockerfile
     ports:
       - "84:80"
-    environment:
-      - EventStore:ConnectionString=Host=db;Database=community;Username=postgres;Password=pg
-      - RabbitMQ:Hostname=rabbit
-      - RabbitMQ:Username=admin
-      - RabbitMQ:Password=admin
+    env_file:
+      - ./community.env
 
   employee-web-client:
     image: employee-web-client

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -88,11 +88,8 @@ services:
       dockerfile: community-service/Dockerfile
     ports:
       - "84:80"
-    environment:
-      - EventStore:ConnectionString=Host=db;Database=community;Username=postgres;Password=pg
-      - RabbitMQ:Hostname=rabbit
-      - RabbitMQ:Username=admin
-      - RabbitMQ:Password=admin
+    env_file:
+      - ./community.env
 
 volumes:
   pgdata: