ayan.poddar
/
eShopOnContainers
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 19 Wiki Activity
Browse Source

Changes in compose config for docker-compose up running ok. Added volumes for data

features/migration-dotnet3
eiximenis 5 years ago
parent
0df81ff5d2
commit
e4df0336e5
5 changed files with 169 additions and 41 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +25
    -3
      src/ApiGateways/Envoy/config/mobilemarketing/envoy.yaml
  2. +43
    -11
      src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml
  3. +27
    -5
      src/ApiGateways/Envoy/config/webmarketing/envoy.yaml
  4. +44
    -12
      src/ApiGateways/Envoy/config/webshopping/envoy.yaml
  5. +30
    -10
      src/docker-compose.override.yml

+ 25
- 3
src/ApiGateways/Envoy/config/mobilemarketing/envoy.yaml View File

@ -23,17 +23,39 @@ static_resources:
domains:
- "*"
routes:
- match:
- name: "m-short"
match:
prefix: "/m/"
route:
auto_host_rewrite: true
prefix_rewrite: "/marketing-api/"
cluster: marketing
- match:
- name: "m-long"
match:
prefix: "/marketing-api/"
route:
auto_host_rewrite: true
cluster: marketing
http_filters:
- name: envoy.router
- name: envoy.router
access_log:
- name: envoy.file_access_log
filter:
not_health_check_filter: {}
config:
json_format:
time: "%START_TIME%"
protocol: "%PROTOCOL%"
duration: "%DURATION%"
request_method: "%REQ(:METHOD)%"
request_host: "%REQ(HOST)%"
path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
response_flags: "%RESPONSE_FLAGS%"
route_name: "%ROUTE_NAME%"
upstream_host: "%UPSTREAM_HOST%"
upstream_cluster: "%UPSTREAM_CLUSTER%"
upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
path: "/tmp/access.log"
clusters:
- name: marketing
connect_timeout: 0.25s


+ 43
- 11
src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml View File

@ -23,44 +23,76 @@ static_resources:
domains:
- "*"
routes:
- match:
- name: "c-short"
match:
prefix: "/c/"
route:
auto_host_rewrite: true
prefix_rewrite: "/catalog-api/"
cluster: catalog
- match:
- name: "c-long"
match:
prefix: "/catalog-api/"
route:
auto_host_rewrite: true
cluster: catalog
- match:
- name: "o-short"
match:
prefix: "/o/"
route:
auto_host_rewrite: true
prefix_rewrite: "/ordering-api/"
cluster: ordering
- match:
- name: "o-long"
match:
prefix: "/ordering-api/"
route:
auto_host_rewrite: true
cluster: ordering
- match:
- name: "b-short"
match:
prefix: "/b/"
route:
auto_host_rewrite: true
prefix_rewrite: "/basket-api/"
cluster: basket
- match:
- name: "b-long"
match:
prefix: "/basket-api/"
route:
auto_host_rewrite: true
cluster: basket
- match:
- name: "agg"
match:
prefix: "/"
route:
auto_host_rewrite: true
prefix_rewrite: "/"
cluster: shoppingagg
http_filters:
- name: envoy.router
access_log:
- name: envoy.file_access_log
filter:
not_health_check_filter: {}
config:
json_format:
time: "%START_TIME%"
protocol: "%PROTOCOL%"
duration: "%DURATION%"
request_method: "%REQ(:METHOD)%"
request_host: "%REQ(HOST)%"
path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
response_flags: "%RESPONSE_FLAGS%"
route_name: "%ROUTE_NAME%"
upstream_host: "%UPSTREAM_HOST%"
upstream_cluster: "%UPSTREAM_CLUSTER%"
upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
path: "/tmp/access.log"
clusters:
- name: shoppingagg
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -68,7 +100,7 @@ static_resources:
port_value: 80
- name: catalog
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -76,7 +108,7 @@ static_resources:
port_value: 80
- name: basket
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -84,7 +116,7 @@ static_resources:
port_value: 80
- name: ordering
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:


+ 27
- 5
src/ApiGateways/Envoy/config/webmarketing/envoy.yaml View File

@ -23,21 +23,43 @@ static_resources:
domains:
- "*"
routes:
- match:
- name: "m-short"
match:
prefix: "/m/"
route:
auto_host_rewrite: true
prefix_rewrite: "/marketing-api/"
cluster: marketing
- match:
- name: "m-long"
match:
prefix: "/marketing-api/"
route:
auto_host_rewrite: true
cluster: marketing
http_filters:
- name: envoy.router
- name: envoy.router
access_log:
- name: envoy.file_access_log
filter:
not_health_check_filter: {}
config:
json_format:
time: "%START_TIME%"
protocol: "%PROTOCOL%"
duration: "%DURATION%"
request_method: "%REQ(:METHOD)%"
request_host: "%REQ(HOST)%"
path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
response_flags: "%RESPONSE_FLAGS%"
route_name: "%ROUTE_NAME%"
upstream_host: "%UPSTREAM_HOST%"
upstream_cluster: "%UPSTREAM_CLUSTER%"
upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
path: "/tmp/access.log"
clusters:
- name: marketing
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -45,7 +67,7 @@ static_resources:
port_value: 80
- name: locations
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:


+ 44
- 12
src/ApiGateways/Envoy/config/webshopping/envoy.yaml View File

@ -23,44 +23,76 @@ static_resources:
domains:
- "*"
routes:
- match:
- name: "c-short"
match:
prefix: "/c/"
route:
auto_host_rewrite: true
prefix_rewrite: "/catalog-api/"
cluster: catalog
- match:
- name: "c-long"
match:
prefix: "/catalog-api/"
route:
auto_host_rewrite: true
cluster: catalog
- match:
- name: "o-short"
match:
prefix: "/o/"
route:
auto_host_rewrite: true
prefix_rewrite: "/ordering-api/"
cluster: ordering
- match:
- name: "o-long"
match:
prefix: "/ordering-api/"
route:
auto_host_rewrite: true
cluster: ordering
- match:
- name: "b-short"
match:
prefix: "/b/"
route:
auto_host_rewrite: true
prefix_rewrite: "/basket-api/"
cluster: basket
- match:
- name: "b-long"
match:
prefix: "/basket-api/"
route:
auto_host_rewrite: true
cluster: basket
- match:
- name: "agg"
match:
prefix: "/"
route:
auto_host_rewrite: true
prefix_rewrite: "/"
cluster: shoppingagg
http_filters:
- name: envoy.router
- name: envoy.router
access_log:
- name: envoy.file_access_log
filter:
not_health_check_filter: {}
config:
json_format:
time: "%START_TIME%"
protocol: "%PROTOCOL%"
duration: "%DURATION%"
request_method: "%REQ(:METHOD)%"
request_host: "%REQ(HOST)%"
path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
response_flags: "%RESPONSE_FLAGS%"
route_name: "%ROUTE_NAME%"
upstream_host: "%UPSTREAM_HOST%"
upstream_cluster: "%UPSTREAM_CLUSTER%"
upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
path: "/tmp/access.log"
clusters:
- name: shoppingagg
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -68,7 +100,7 @@ static_resources:
port_value: 80
- name: catalog
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -76,7 +108,7 @@ static_resources:
port_value: 80
- name: basket
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
@ -84,7 +116,7 @@ static_resources:
port_value: 80
- name: ordering
connect_timeout: 0.25s
type: logical_dns
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:


+ 30
- 10
src/docker-compose.override.yml View File

@ -19,15 +19,20 @@ services:
- ACCEPT_EULA=Y
ports:
- "5433:1433"
volumes:
- eshop-sqldata:/var/opt/mssql
nosqldata:
ports:
- "27017:27017"
volumes:
- eshop-nosqldata:/data/db
basketdata:
ports:
- "6379:6379"
volumes:
- eshop-basketdata:/data
rabbitmq:
ports:
- "15672:15672"
@ -69,10 +74,12 @@ services:
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
- UseLoadTest=${USE_LOADTEST:-False}
- PATH_BASE=/basket-api
- GRPC_PORT=81
- PORT=80
ports:
- "5103:80"
- "5580:5001"
- "9103:81"
catalog-api:
environment:
@ -91,6 +98,7 @@ services:
- OrchestratorType=${ORCHESTRATOR_TYPE}
- GRPC_PORT=81
- PORT=80
- PATH_BASE=/catalog-api
ports:
- "5101:80"
- "9101:81"
@ -113,9 +121,12 @@ services:
- UseLoadTest=${USE_LOADTEST:-False}
- Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
- Serilog__MinimumLevel__Override__ordering-api=Verbose
- PATH_BASE=/ordering-api
- GRPC_PORT=81
- PORT=80
ports:
- "5102:80"
- "5581:5001"
- "9102:81"
ordering-backgroundtasks:
environment:
@ -157,6 +168,7 @@ services:
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
- UseLoadTest=${USE_LOADTEST:-False}
- PATH_BASE=/marketing-api
ports:
- "5110:80"
@ -190,6 +202,7 @@ services:
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
- UseLoadTest=${USE_LOADTEST:-False}
- PATH_BASE=/locations-api
ports:
- "5109:80"
@ -241,9 +254,9 @@ services:
- urls__catalog=http://catalog-api
- urls__orders=http://ordering-api
- urls__identity=http://identity-api
- urls__grpcBasket=http://10.0.75.1:5580
- urls__grpcCatalog=http://10.0.75.1:9101
- urls__grpcOrdering=http://10.0.75.1:5581
- urls__grpcBasket=http://basket-api:81
- urls__grpcCatalog=http://catalog-api:81
- urls__grpcOrdering=http://ordering-api:81
- CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc
- IdentityUrlHC=http://identity-api/hc
@ -262,9 +275,9 @@ services:
- urls__catalog=http://catalog-api
- urls__orders=http://ordering-api
- urls__identity=http://identity-api
- urls__grpcBasket=http://10.0.75.1:5580
- urls__grpcCatalog=http://10.0.75.1:9101
- urls__grpcOrdering=http://10.0.75.1:5581
- urls__grpcBasket=http://basket-api:81
- urls__grpcCatalog=http://catalog-api:81
- urls__grpcOrdering=http://ordering-api:81
- CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc
- IdentityUrlHC=http://identity-api/hc
@ -366,4 +379,11 @@ services:
- SelfUrl=http://webhooks-client/
ports:
- "5114:80"
volumes:
eshop-sqldata:
external: false
eshop-nosqldata:
external: false
eshop-basketdata:
external: false

Write Preview
Loading…
Cancel
Save