Add .env template, update appsettings for Docker compatibility, and modify service configurations

Author: giovanninocco

README.md

@@ -73,10 +73,10 @@ You can use **Docker compose** to setup the infrastructure components just by ru
 
 ``` bash
 cd ./containers
-# Setup the infrastructure
+# Setup the infrastructure. Use this file to setup the basic infrastructure components (RabbitMQ, MongoDB)
 docker compose -f ./infrastructure.yml --env-file ./.env --project-name genocs up -d
 
-# Use this file only in case you want to setup Redis and Postgres db (no need if you use mongo)
+# Use this file only in case you want to setup Redis and PostgreSQL (no need if you use MongoDB)
 docker compose -f ./infrastructure-db.yml --env-file ./.env --project-name genocs up -d
 
 # Use this file only in case you want to setup monitoring infrastructure components (Prometheus, Grafana, InfluxDB, Jaeger, Seq)
@@ -88,13 +88,13 @@ docker compose -f ./infrastructure-scaling.yml --env-file ./.env --project-name
 # Use this file only in case you want to setup security infrastructure components (Vault)
 docker compose -f ./infrastructure-security.yml --env-file ./.env --project-name genocs up -d
 
-# Use this file only in case you want to setup sqlserver database (no need if you use postgres)
+# Use this file only in case you want to setup sqlserver database (no need if you use PostgreSQL)
 docker compose -f ./infrastructure-sqlserver.yml --env-file ./.env --project-name genocs up -d
 
-# Use this file only in case you want to setup mySql database (no need if you use postgres)
+# Use this file only in case you want to setup mySql database (no need if you use PostgreSQL)
 docker compose -f ./infrastructure-mysql.yml --env-file ./.env --project-name genocs up -d
 
-# Use this file only in case you want to setup oracle database (no need if you use postgres)
+# Use this file only in case you want to setup oracle database (no need if you use PostgreSQL)
 docker compose -f ./infrastructure-oracle.yml --env-file ./.env --project-name genocs up -d
 
 # Use this file only in case you want to setup elk stack
@@ -104,18 +104,24 @@ docker compose -f ./infrastructure-elk.yml --env-file ./.env --project-name geno
 docker compose -f ./infrastructure-ml.yml --env-file ./.env --project-name genocs up -d
 ```
 
-`infrastructure-bare.yml` allows to install the basic infrastructure components. They are:
+`infrastructure.yml` allows to install the basic infrastructure components. They are:
 - [RabbitMQ](https://rabbitmq.com)
 - [Redis](https://redis.io)
 - [MongoDB](https://mongodb.com)
-- [Postgres](https://www.postgresql.org/).
+- [Postgres](https://www.postgresql.org/)
 
-You can run them locally:
+
+`infrastructure-db.yml` allows to install Redis and PostgreSQL
+- [Redis](https://redis.io)
+- [Postgres](https://www.postgresql.org/)
+
+
+You can check them locally:
 
 - [RabbitMQ](http://localhost:15672): `localhost:15672`
-- Redis: `localhost:6379`
-- MongoDB: `localhost:27017`
-- Postgres: `localhost:5432`
+- Redis: `TCP:localhost:6379`
+- MongoDB: `TCP:localhost:27017`
+- Postgres: `TCP:localhost:5432`
 
 
 `infrastructure-monitoring.yml` allows to install the monitoring infrastructure components. They are:
@@ -126,7 +132,7 @@ You can run them locally:
 - [Seq](https://datalust.co/seq)
 
 
-You can run them locally:
+You can find the console locally at:
 
 - [Prometheus](localhost:9090): `localhost:9090`
 - [Grafana](localhost:3000): `localhost:3000`
@@ -135,9 +141,13 @@ You can run them locally:
 - [Seq](localhost:5341): `localhost:5341`
 
 
-`infrastructure-scaling.yml` allows to install the scaling infrastructure components. They are:
-- Fabio
-- Consul
+`infrastructure-scaling.yml` allows to install the scaling infrastructure components composed by Fabio and Consul.
+
+- [Fabio](https://fabiolb.net/)
+- [Consul](https://www.consul.io/)
+
+
+
 
 `infrastructure-security.yml` allows to install the security infrastructure components.
 
@@ -185,7 +195,7 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
     "enabled": false,
     "url": "http://localhost:8500",
     "service": "demo-service",
-    "address": "docker.for.win.localhost",
+    "address": "docker.for.mac.localhost",
     "port": "5070",
     "pingEnabled": true,
     "pingEndpoint": "health",

containers/.env

@@ -0,0 +1,2 @@
+# This file is a template for the .env file that is used by the docker-compose.yml file.
+POSTGRES_PASSWORD=mySecretPassword1234!

src/Genocs.Core.Demo.Worker/appsettings.json

@@ -43,10 +43,10 @@
     "enabled": false,
     "url": "http://localhost:8500",
     "service": "users-service",
-    "address": "docker.for.win.localhost",
+    "address": "docker.for.mac.localhost",
     "port": "5070",
     "pingEnabled": true,
-    "pingEndpoint": "ping",
+    "pingEndpoint": "alive",
     "pingInterval": 3,
     "removeAfterInterval": 3
   },

src/Genocs.Discovery.Consul/Genocs.Discovery.Consul.csproj

@@ -30,6 +30,5 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.*" />
-        <PackageReference Include="Polly" Version="8.5.0" />
     </ItemGroup>
 </Project>

src/Genocs.LoadBalancing.Fabio/Genocs.LoadBalancing.Fabio.csproj

@@ -28,9 +28,4 @@
         <PackageReference Include="Genocs.HTTP" Version="7.0.0" />
         <PackageReference Include="Genocs.Discovery.Consul" Version="7.0.0" />
     </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Polly" Version="8.5.0" />
-    </ItemGroup>
-
 </Project>

src/apps/api-gateway/Genocs.APIGateway/Properties/launchSettings.json

@@ -1,23 +1,9 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5000"
-    }
-  },
   "profiles": {
-    "Genocs.APIGateway": {
+    "Local": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5500;http://localhost:5501",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "development"
       }

src/apps/api-gateway/Genocs.APIGateway/appsettings.development.json

@@ -7,28 +7,12 @@
     "displayBanner": true,
     "displayVersion": true
   },
-  "jaeger": {
-    "enabled": true,
-    "serviceName": "api-gateway",
-    "udpHost": "localhost",
-    "maxPacketSize": 65000
-  },
-  "jwt": {
-    "certificate": {
-      "location": "certs/localhost.cer"
-    },
-    "issuer": "genocs-identity-service",
-    "validIssuer": "genocs-identity-service",
-    "validateAudience": false,
-    "validateIssuer": true,
-    "validateLifetime": true,
-    "expiry": "01:00:00"
-  },
   "logger": {
     "level": "debug",
     "excludePaths": [
       "/",
-      "/ping",
+      "/health",
+      "/alive",
       "/metrics"
     ],
     "excludeProperties": [
@@ -64,22 +48,22 @@
     },
     "tags": {}
   },
-  "messaging": {
+  "jwt": {
+    "certificate": {
+      "location": "certs/localhost.cer"
+    },
+    "issuer": "genocs-identity-service",
+    "validIssuer": "genocs-identity-service",
+    "validateAudience": false,
+    "validateIssuer": true,
+    "validateLifetime": true,
+    "expiry": "01:00:00"
+  },
+  "jaeger": {
     "enabled": true,
-    "endpoints": [
-      {
-        "method": "post",
-        "path": "stories-service/stories/async",
-        "exchange": "stories",
-        "routingKey": "send_story"
-      },
-      {
-        "method": "post",
-        "path": "stories-service/stories/{storyId}/rate/async",
-        "exchange": "stories",
-        "routingKey": "rate_story"
-      }
-    ]
+    "serviceName": "api-gateway",
+    "udpHost": "localhost",
+    "maxPacketSize": 65000
   },
   "prometheus": {
     "enabled": false,
@@ -179,28 +163,28 @@
       "identity-cluster": {
         "destinations": {
           "destination1": {
-            "address": "https://localhost:5011"
+            "address": "https://localhost:5510"
           }
         }
       },
       "products-cluster": {
         "destinations": {
           "destination1": {
-            "address": "http://localhost:5002"
+            "address": "https://localhost:5520"
           }
         }
       },
       "orders-cluster": {
         "destinations": {
           "destination1": {
-            "address": "http://localhost:5003"
+            "address": "https://localhost:5530"
           }
         }
       },
       "signalr-cluster": {
         "destinations": {
           "destination1": {
-            "address": "http://localhost:5004"
+            "address": "https://localhost:5540"
           }
         }
       }
@@ -236,4 +220,4 @@
       }
     }
   }
-}
+}

src/apps/api-gateway/Genocs.APIGateway/appsettings.json

@@ -1,27 +1,12 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:61699/",
-      "sslPort": 44323
-    }
-  },
   "profiles": {
-    "Genocs.Core.Demo.Users.WebApi": {
+    "Local": {
       "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:5510;http://localhost:5511",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "IIS Express": {
-        "commandName": "IISExpress",
-        "launchBrowser": true,
-        "environmentVariables": {
-          "ASPNETCORE_ENVIRONMENT": "Development"
-        }
-      },
-      "applicationUrl": "https://localhost:5011;http://localhost:5001"
+      }
     }
   }
 }

src/apps/identity/Genocs.Identities.WebApi/Properties/launchSettings.json

@@ -32,10 +32,10 @@
     "enabled": false,
     "url": "http://localhost:8500",
     "service": "identity-service",
-    "address": "docker.for.win.localhost",
-    "port": "5070",
+    "address": "docker.for.mac.localhost",
+    "port": "5511",
     "pingEnabled": true,
-    "pingEndpoint": "ping",
+    "pingEndpoint": "alive",
     "pingInterval": 3,
     "removeAfterInterval": 3
   },