Merge branch 'main' into gterdem/docker-compose

gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.Development.json

@@ -5,5 +5,21 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:5000",
+        "Protocols": "Http1AndHttp2"
+      },
+      "Https": {
+        "Url": "https://localhost:44354",
+        "Protocols": "Http1AndHttp2"
+      },
+      "gRPC": {
+        "Url": "http://localhost:81",
+        "Protocols": "Http2"
+      }
+    }
   }
 }

gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.Docker.json

@@ -1,4 +1,4 @@
-{
+{  
   "ReverseProxy": {
     "Routes": {
       "Account Service": {

gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.Staging.json

@@ -0,0 +1,100 @@
+{
+  "ReverseProxy": {
+    "Routes": {
+      "Account Service": {
+        "ClusterId": "accountCluster",
+        "Match": {
+          "Path": "/api/account/{**everything}"
+        }
+      },
+      "Administration Service": {
+        "ClusterId": "administrationCluster",
+        "Match": {
+          "Path": "/api/abp/{**everything}"
+        }
+      },
+      "Catalog Service": {
+        "ClusterId": "catalogCluster",
+        "Match": {
+          "Path": "/api/catalog/{**everything}"
+        }
+      },
+      "Basket Service": {
+        "ClusterId": "basketCluster",
+        "Match": {
+          "Path": "/api/basket/{**everything}"
+        }
+      },
+      "Ordering Service": {
+        "ClusterId": "orderingCluster",
+        "Match": {
+          "Path": "/api/ordering/{**everything}"
+        }
+      },
+      "Payment Service": {
+        "ClusterId": "paymentCluster",
+        "Match": {
+          "Path": "/api/payment/{**everything}"
+        }
+      },
+      "product-picture-route": {
+        "ClusterId": "productPictureCluster",
+        "Match": {
+          "Path": "/product-images/{**everything}",
+          "Methods" : [ "GET" ]
+        }
+      }
+    },
+    "Clusters": {
+      "accountCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-authserver"
+          }
+        }
+      },
+      "administrationCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-administration"
+          }
+        }
+      },
+      "catalogCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-catalog"
+          }
+        }
+      },
+      "basketCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-basket"
+          }
+        }
+      },            
+      "orderingCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-ordering"
+          }
+        }
+      },
+      "paymentCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-payment"
+          }
+        }
+      },
+      "productPictureCluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://eshop-st-catalog"
+          }
+        }
+      }
+    }
+  }
+}

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.Development.json

@@ -1,2 +1,18 @@
 {
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:5000",
+        "Protocols": "Http1AndHttp2"
+      },
+      "Https": {
+        "Url": "https://localhost:44354",
+        "Protocols": "Http1AndHttp2"
+      },
+      "gRPC": {
+        "Url": "http://localhost:81",
+        "Protocols": "Http2"
+      }
+    }
+  }
 }

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.Docker.json

@@ -30,15 +30,15 @@
   "Kestrel": {
     "Endpoints": {
       "Http": {
-        "Url": "http://localhost:5000",
+        "Url": "http://docker.host.internal:80",
         "Protocols": "Http1AndHttp2"
       },
       "Https": {
-        "Url": "https://localhost:44354",
+        "Url": "https://docker.host.internal:443",
         "Protocols": "Http1AndHttp2"
       },
       "gRPC": {
-        "Url": "http://localhost:81",
+        "Url": "http://docker.host.internal:81",
         "Protocols": "Http2"
       }
     }

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.json

@@ -40,21 +40,5 @@
   },
   "ElasticSearch": {
     "Url": "http://localhost:9200"
-  },
-  "Kestrel": {
-    "Endpoints": {
-      "Http": {
-        "Url": "http://localhost:5000",
-        "Protocols": "Http1AndHttp2"
-      },
-      "Https": {
-        "Url": "https://localhost:44354",
-        "Protocols": "Http1AndHttp2"
-      },
-      "gRPC": {
-        "Url": "http://localhost:81",
-        "Protocols": "Http2"
-      }
-    }
   }
-}
+}

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.secrets.json

@@ -1,2 +0,0 @@
-{
-}