Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Remove envoy (#2127)
Browse files Browse the repository at this point in the history
- Just go through the gateway directly
- We'll need to update the mobile version eventually
  • Loading branch information
davidfowl committed Jun 16, 2023
1 parent 67d4c06 commit 06d5164
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 339 deletions.
6 changes: 3 additions & 3 deletions src/.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

# Use this values to run the app locally in Windows
ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5121/c/api/v1/catalog/items/[0]/pic/

# Use this values to run the app locally in Mac
# ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost
# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5202/c/api/v1/catalog/items/[0]/pic/
# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5121/c/api/v1/catalog/items/[0]/pic/

# Use this values to run the app locally in Linux
# ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.linux.localhost
# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/c/api/v1/catalog/items/[0]/pic/
# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5121/c/api/v1/catalog/items/[0]/pic/

# Configure this values to the cloud storage locations
# ESHOP_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>
Expand Down
139 changes: 0 additions & 139 deletions src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml

This file was deleted.

142 changes: 0 additions & 142 deletions src/ApiGateways/Envoy/config/webshopping/envoy.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions src/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,20 +169,6 @@ services:
ports:
- "5113:80"

mobileshoppingapigw:
volumes:
- ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
ports:
- "5200:80"
- "15200:8001"

webshoppingapigw:
volumes:
- ./ApiGateways/Envoy/config/webshopping:/etc/envoy
ports:
- "5202:80"
- "15202:8001"

mobileshoppingagg:
environment:
- ASPNETCORE_ENVIRONMENT=Development
Expand Down
22 changes: 1 addition & 21 deletions src/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- PurchaseUrl=http://webshoppingapigw
- PurchaseUrl=http://webshoppingagg
- IdentityUrl=http://10.0.75.1:5105 # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
- CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc
Expand Down Expand Up @@ -191,26 +191,6 @@ services:
- "15672:15672" # Important: In a production environment your should remove the external port
- "5672:5672" # Important: In a production environment your should remove the external port

mobileshoppingapigw:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- "5200:80" # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration

webshoppingapigw:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- "5202:80" # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./ApiGateways/Web.Bff.Shopping/apigw:/app/configuration

mobileshoppingagg:
environment:
- ASPNETCORE_ENVIRONMENT=Development
Expand Down
6 changes: 0 additions & 6 deletions src/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ services:
depends_on:
- sqldata

mobileshoppingapigw:
image: envoyproxy/envoy:v1.11.1

mobileshoppingagg:
image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
build:
Expand Down Expand Up @@ -154,6 +151,3 @@ services:
dockerfile: Web/WebhookClient/Dockerfile
depends_on:
- webhooks-api

webshoppingapigw:
image: envoyproxy/envoy:v1.11.1
Loading

0 comments on commit 06d5164

Please sign in to comment.