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

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

Browse Source
This commit is contained in:
eiximenis 2019-10-16 10:26:43 +02:00
parent 0df81ff5d2
commit e4df0336e5
5 changed files with 169 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ApiGateways/Envoy/config/mobilemarketing/envoy.yaml
View File

@ -23,17 +23,39 @@ static_resources:
domains: domains:
- "*" - "*"
routes: routes:
- match: - name: "m-short"
match:
prefix: "/m/" prefix: "/m/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/marketing-api/" prefix_rewrite: "/marketing-api/"
cluster: marketing cluster: marketing
- match: - name: "m-long"
match:
prefix: "/marketing-api/" prefix: "/marketing-api/"
route: route:
auto_host_rewrite: true
cluster: marketing cluster: marketing
http_filters: 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: clusters:
- name: marketing - name: marketing
connect_timeout: 0.25s connect_timeout: 0.25s

54
src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml
View File

@ -23,44 +23,76 @@ static_resources:
domains: domains:
- "*" - "*"
routes: routes:
- match: - name: "c-short"
match:
prefix: "/c/" prefix: "/c/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/catalog-api/" prefix_rewrite: "/catalog-api/"
cluster: catalog cluster: catalog
- match: - name: "c-long"
match:
prefix: "/catalog-api/" prefix: "/catalog-api/"
route: route:
auto_host_rewrite: true
cluster: catalog cluster: catalog
- match: - name: "o-short"
match:
prefix: "/o/" prefix: "/o/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/ordering-api/" prefix_rewrite: "/ordering-api/"
cluster: ordering cluster: ordering
- match: - name: "o-long"
match:
prefix: "/ordering-api/" prefix: "/ordering-api/"
route: route:
auto_host_rewrite: true
cluster: ordering cluster: ordering
- match: - name: "b-short"
match:
prefix: "/b/" prefix: "/b/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/basket-api/" prefix_rewrite: "/basket-api/"
cluster: basket cluster: basket
- match: - name: "b-long"
match:
prefix: "/basket-api/" prefix: "/basket-api/"
route: route:
auto_host_rewrite: true
cluster: basket cluster: basket
- match: - name: "agg"
match:
prefix: "/" prefix: "/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/" prefix_rewrite: "/"
cluster: shoppingagg cluster: shoppingagg
http_filters: 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: clusters:
- name: shoppingagg - name: shoppingagg
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -68,7 +100,7 @@ static_resources:
port_value: 80 port_value: 80
- name: catalog - name: catalog
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -76,7 +108,7 @@ static_resources:
port_value: 80 port_value: 80
- name: basket - name: basket
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -84,7 +116,7 @@ static_resources:
port_value: 80 port_value: 80
- name: ordering - name: ordering
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:

32
src/ApiGateways/Envoy/config/webmarketing/envoy.yaml
View File

@ -23,21 +23,43 @@ static_resources:
domains: domains:
- "*" - "*"
routes: routes:
- match: - name: "m-short"
match:
prefix: "/m/" prefix: "/m/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/marketing-api/" prefix_rewrite: "/marketing-api/"
cluster: marketing cluster: marketing
- match: - name: "m-long"
match:
prefix: "/marketing-api/" prefix: "/marketing-api/"
route: route:
auto_host_rewrite: true
cluster: marketing cluster: marketing
http_filters: 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: clusters:
- name: marketing - name: marketing
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -45,7 +67,7 @@ static_resources:
port_value: 80 port_value: 80
- name: locations - name: locations
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:

56
src/ApiGateways/Envoy/config/webshopping/envoy.yaml
View File

@ -23,44 +23,76 @@ static_resources:
domains: domains:
- "*" - "*"
routes: routes:
- match: - name: "c-short"
match:
prefix: "/c/" prefix: "/c/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/catalog-api/" prefix_rewrite: "/catalog-api/"
cluster: catalog cluster: catalog
- match: - name: "c-long"
match:
prefix: "/catalog-api/" prefix: "/catalog-api/"
route: route:
auto_host_rewrite: true
cluster: catalog cluster: catalog
- match: - name: "o-short"
match:
prefix: "/o/" prefix: "/o/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/ordering-api/" prefix_rewrite: "/ordering-api/"
cluster: ordering cluster: ordering
- match: - name: "o-long"
match:
prefix: "/ordering-api/" prefix: "/ordering-api/"
route: route:
auto_host_rewrite: true
cluster: ordering cluster: ordering
- match: - name: "b-short"
match:
prefix: "/b/" prefix: "/b/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/basket-api/" prefix_rewrite: "/basket-api/"
cluster: basket cluster: basket
- match: - name: "b-long"
match:
prefix: "/basket-api/" prefix: "/basket-api/"
route: route:
auto_host_rewrite: true
cluster: basket cluster: basket
- match: - name: "agg"
match:
prefix: "/" prefix: "/"
route: route:
auto_host_rewrite: true
prefix_rewrite: "/" prefix_rewrite: "/"
cluster: shoppingagg cluster: shoppingagg
http_filters: 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: clusters:
- name: shoppingagg - name: shoppingagg
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -68,7 +100,7 @@ static_resources:
port_value: 80 port_value: 80
- name: catalog - name: catalog
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -76,7 +108,7 @@ static_resources:
port_value: 80 port_value: 80
- name: basket - name: basket
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:
@ -84,7 +116,7 @@ static_resources:
port_value: 80 port_value: 80
- name: ordering - name: ordering
connect_timeout: 0.25s connect_timeout: 0.25s
type: logical_dns type: strict_dns
lb_policy: round_robin lb_policy: round_robin
hosts: hosts:
- socket_address: - socket_address:

40
src/docker-compose.override.yml
View File

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