Fix configuration on docker without Fabio and Consul

Author: giovanninocco

README.md

@@ -211,11 +211,11 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
       "password": "test",
       "rawData": ""
     },
-    "issuer": "demo",
-    "validIssuer": "demo",
+    "issuer": "genocs-identity-service",
+    "validIssuer": "genocs-identity-service",
     "validateAudience": false,
-    "validateIssuer": false,
-    "validateLifetime": false,
+    "validateIssuer": true,
+    "validateLifetime": true,
     "expiry": "01:00:00"
   },
   "metrics": {

containers/prometheus/prometheus.yml

@@ -9,20 +9,20 @@ scrape_configs:
 
   - job_name: "api-gateway"
     static_configs:
-      - targets: ["api-gateway:5500"]
+      - targets: ["api-gateway"]
 
- - job_name: "identity-service"
-   static_configs:
-     - targets: ["identity-service:5501"]
-
- - job_name: "products-service"
-   static_configs:
-     - targets: ["products-service:5002"]
-
- - job_name: "orders-service"
-   static_configs:
-     - targets: ["orders-service:5503"]
-
- - job_name: "signalr-service"
-   static_configs:
-     - targets: ["signalr-service:5504"]
+  - job_name: "identity-service"
+    static_configs:
+      - targets: ["identity-service"]
+ 
+  - job_name: "products-service"
+    static_configs:
+      - targets: ["products-service"]
+ 
+  - job_name: "orders-service"
+    static_configs:
+      - targets: ["orders-service"]
+ 
+  - job_name: "signalr-service"
+    static_configs:
+      - targets: ["signalr-service"]

src/Genocs.Auth/README.md

@@ -26,12 +26,12 @@ Following are the project settings needed to enable monitoring
       "password": "test",
       "rawData": ""
     },
-    "issuer": "identity",
-    "validIssuer": "identity",
+    "issuer": "genocs-identity-service",
+    "validIssuer": "genocs-identity-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,
-    "expiry": "01:00:00"
+    "expiry": "01:00:00"  
   }
 ```
 

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

@@ -37,12 +37,12 @@
     "ConnectionString": "mongodb://localhost",
     "Database": "demo"
   },
-  "JWT": {
+  "jwt": {
     "ValidIssuer": "http://localhost/Auth",
     "ValidAudience": "https://localhost:5000",
     "Secret": "<<>>"
   },
   "Monitoring": {
     "Jaeger": "localhost"
   }
-}
+}

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

@@ -67,7 +67,11 @@
   },
   "logger": {
     "level": "information",
-    "excludePaths": [ "/", "/ping", "/metrics" ],
+    "excludePaths": [
+      "/",
+      "/ping",
+      "/metrics"
+    ],
     "excludeProperties": [
       "api_key",
       "access_key",
@@ -112,16 +116,20 @@
     "udpPort": 6831,
     "maxPacketSize": 65000,
     "sampler": "const",
-    "excludePaths": [ "/", "/ping", "/metrics" ]
+    "excludePaths": [
+      "/",
+      "/ping",
+      "/metrics"
+    ]
   },
   "jwt": {
     "certificate": {
       "location": "certs/localhost.pfx",
       "password": "test",
       "rawData": ""
     },
-    "issuer": "demo",
-    "validIssuer": "demo",
+    "issuer": "genocs-identity-service",
+    "validIssuer": "genocs-identity-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,
@@ -245,4 +253,4 @@
       }
     }
   }
-}
+}

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

@@ -4,7 +4,7 @@
     "url": "http://consul:8500",
     "service": "api-gateway",
     "address": "api-gateway",
-    "port": "5500"
+    "port": "80"
   },
   "fabio": {
     "enabled": true,
@@ -29,7 +29,8 @@
     "enabled": true,
     "influxEnabled": true,
     "prometheusEnabled": true,
-    "influxUrl": "http://influxdb:8086"
+    "influxUrl": "http://influxdb:8086",
+    "env": "docker"
   },
   "prometheus": {
     "enabled": true
@@ -52,14 +53,14 @@
       "products-cluster": {
         "destinations": {
           "destination1": {
-            "address": "http://product-service"
+            "address": "http://products-service"
           }
         }
       },
       "orders-cluster": {
         "destinations": {
           "destination1": {
-            "address": "http://order-service"
+            "address": "http://orders-service"
           }
         }
       },

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

@@ -20,10 +20,12 @@
     "certificate": {
       "location": "certs/localhost.cer"
     },
-    "validIssuer": "genocs-identity-service-bla",
-    "validateAudience": true,
+    "issuer": "genocs-identity-service",
+    "validIssuer": "genocs-identity-service",
+    "validateAudience": false,
     "validateIssuer": true,
-    "validateLifetime": true
+    "validateLifetime": true,
+    "expiry": "01:00:00"
   },
   "logger": {
     "level": "information",

src/apps/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - genocs
     # network_mode: bridge
     volumes:
-      - apigateway:/var/lib/data
+      - apigateway:/root/.aspnet/DataProtection-Keys
 
   identity-service:
     image: genocs/identity-webapi:${IMAGE_VERSION}
@@ -27,7 +27,7 @@ services:
       - genocs
     # network_mode: bridge
     volumes:
-      - identity:/var/lib/data
+      - identity:/root/.aspnet/DataProtection-Keys
 
   products-service:
     image: genocs/product-webapi:${IMAGE_VERSION}
@@ -42,7 +42,7 @@ services:
       - genocs
     # network_mode: bridge
     volumes:
-      - products:/var/lib/data
+      - products:/root/.aspnet/DataProtection-Keys
 
   orders-service:
     image: genocs/order-webapi:${IMAGE_VERSION}
@@ -57,7 +57,7 @@ services:
       - genocs
     # network_mode: bridge
     volumes:
-      - orders:/var/lib/data
+      - orders:/root/.aspnet/DataProtection-Keys
 
   signalr-service:
     image: genocs/signalr-webapi:${IMAGE_VERSION}
@@ -72,7 +72,8 @@ services:
       - genocs
     # network_mode: bridge
     volumes:
-      - signalr:/var/lib/data
+      - signalr:/root/.aspnet/DataProtection-Keys
+
 networks:
   genocs:
     name: genocs-network

src/apps/identity/Genocs.Identities.WebApi/appsettings.Docker.json

@@ -1,11 +1,15 @@
 {
   "consul": {
     "enabled": true,
-    "url": "http://consul:8500"
+    "url": "http://consul:8500",
+    "service": "identity-service",
+    "address": "identity-service",
+    "port": "80"
   },
   "fabio": {
     "enabled": true,
-    "url": "http://fabio:9999"
+    "url": "http://localhost:9999",
+    "service": "identity-service"
   },
   "logger": {
     "seq": {
@@ -25,7 +29,8 @@
     "enabled": true,
     "influxEnabled": true,
     "prometheusEnabled": true,
-    "influxUrl": "http://influxdb:8086"
+    "influxUrl": "http://influxdb:8086",
+    "env": "docker"
   },
   "prometheus": {
     "enabled": true

src/apps/orders/Genocs.Orders.WebApi/appsettings.Docker.json

@@ -4,7 +4,7 @@
     "url": "http://consul:8500",
     "service": "orders-service",
     "address": "orders-service",
-    "port": "5503"
+    "port": "80"
   },
   "fabio": {
     "enabled": true,
@@ -29,7 +29,8 @@
     "enabled": true,
     "influxEnabled": true,
     "prometheusEnabled": true,
-    "influxUrl": "http://influxdb:8086"
+    "influxUrl": "http://influxdb:8086",
+    "env": "docker"
   },
   "prometheus": {
     "enabled": true