From 40315c69d7908053939c6cda536543869123b10d Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Sun, 7 May 2023 19:28:55 -0700
Subject: [PATCH] Make docker use the reverse proxy

---
 .../Web.Bff.Shopping/aggregator/appsettings.json          | 8 ++++----
 src/docker-compose.override.yml                           | 8 ++++++--
 src/docker-compose.yml                                    | 1 -
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json
index ee2b43e35..233d14be5 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json
@@ -94,28 +94,28 @@
     "Clusters": {
       "basket": {
         "Destinations": {
-          "basket/destination0": {
+          "destination0": {
             "Address": "http://localhost:5221"
           }
         }
       },
       "catalog": {
         "Destinations": {
-          "catalog/destination0": {
+          "destination0": {
             "Address": "http://localhost:5222"
           }
         }
       },
       "orders": {
         "Destinations": {
-          "orders/destination0": {
+          "destination0": {
             "Address": "http://localhost:5224"
           }
         }
       },
       "signalr": {
         "Destinations": {
-          "signalr/destination0": {
+          "destination0": {
             "Address": "http://localhost:5225"
           }
         }
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index 46c762515..f60cde8b7 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -213,6 +213,10 @@ services:
       - urls__grpcBasket=http://basket-api:81
       - urls__grpcCatalog=http://catalog-api:81
       - urls__grpcOrdering=http://ordering-api:81
+      - ReverseProxy__Clusters__basket__Destinations__destination0__Address=http://basket-api
+      - ReverseProxy__Clusters__catalog__Destinations__destination0__Address=http://catalog-api
+      - ReverseProxy__Clusters__orders__Destinations__destination0__Address=http://ordering-api
+      - ReverseProxy__Clusters__signalr__Destinations__destination0__Address=http://ordering-signalrhub
       - CatalogUrlHC=http://catalog-api/hc
       - OrderingUrlHC=http://ordering-api/hc
       - IdentityUrlHC=http://identity-api/hc
@@ -286,9 +290,9 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - PurchaseUrl=http://webshoppingapigw
+      - PurchaseUrl=http://webshoppingagg
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-      - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
+      - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
       - IdentityUrlHC=http://identity-api/hc
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 327b6f7ac..6a9a48310 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -147,7 +147,6 @@ services:
       dockerfile: Web/WebMVC/Dockerfile
     depends_on:
       - webshoppingagg
-      - webshoppingapigw
 
   webhooks-client:
     image: ${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}