Skip to content

Commit 0eae3c3

Browse files
eiximeniseiximenis
committed
Merge branch 'features/webhooks' into dev
2 parents adbe31b + dc36826 commit 0eae3c3

139 files changed

Lines changed: 38664 additions & 36 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docker-compose-tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ services:
1414
image: mongo
1515

1616
identity-api-test:
17-
image: eshop/identity-api-test:${TAG:-latest}
17+
image: ${REGISTRY:-eshop}/identity-api-test:${TAG:-latest}
1818
build:
1919
context: .
2020
dockerfile: src/Services/Identity/Identity.API/Dockerfile
2121
depends_on:
2222
- sql-data-test
2323

2424
basket-api-test:
25-
image: eshop/basket-api-test:${TAG:-latest}
25+
image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
2626
build:
2727
context: .
2828
dockerfile: src/Services/Basket/Basket.API/Dockerfile
@@ -35,7 +35,7 @@ services:
3535
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
3636

3737
basket-api-unit-test:
38-
image: eshop/basket-api-test:${TAG:-latest}
38+
image: ${REGISTRY:-eshop}/basket-api-test:${TAG:-latest}
3939
build:
4040
context: .
4141
dockerfile: src/Services/Basket/Basket.API/Dockerfile
@@ -48,7 +48,7 @@ services:
4848
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
4949

5050
catalog-api-test:
51-
image: eshop/catalog-api-test:${TAG:-latest}
51+
image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest}
5252
build:
5353
context: .
5454
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
@@ -60,7 +60,7 @@ services:
6060
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
6161

6262
catalog-api-unit-test:
63-
image: eshop/catalog-api-test:${TAG:-latest}
63+
image: ${REGISTRY:-eshop}/catalog-api-test:${TAG:-latest}
6464
build:
6565
context: .
6666
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
@@ -72,7 +72,7 @@ services:
7272
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
7373

7474
ordering-api-test:
75-
image: eshop/ordering-api-test:${TAG:-latest}
75+
image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
7676
build:
7777
context: .
7878
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
@@ -84,7 +84,7 @@ services:
8484
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
8585

8686
ordering-api-unit-test:
87-
image: eshop/ordering-api-test:${TAG:-latest}
87+
image: ${REGISTRY:-eshop}/ordering-api-test:${TAG:-latest}
8888
build:
8989
context: .
9090
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
@@ -96,7 +96,7 @@ services:
9696
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
9797

9898
marketing-api-test:
99-
image: eshop/marketing-api-test:${TAG:-latest}
99+
image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
100100
build:
101101
context: .
102102
dockerfile: src/Services/Marketing/Marketing.API/Dockerfile
@@ -110,15 +110,15 @@ services:
110110
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
111111

112112
payment-api-test:
113-
image: eshop/payment-api-test:${TAG:-latest}
113+
image: ${REGISTRY:-eshop}/payment-api-test:${TAG:-latest}
114114
build:
115115
context: .
116116
dockerfile: src/Services/Payment/Payment.API/Dockerfile
117117
depends_on:
118118
- rabbitmq-test
119119

120120
locations-api-test:
121-
image: eshop/locations-api-test:${TAG:-latest}
121+
image: ${REGISTRY:-eshop}/locations-api-test:${TAG:-latest}
122122
build:
123123
context: .
124124
dockerfile: src/Services/Location/Locations.API/Dockerfile

‎docker-compose.override.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ services:
4141
- OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
4242
- MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
4343
- WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
44+
- WebhooksApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5113
45+
- WebhooksWebClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5114
4446
- UseCustomizationData=True
4547
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
4648
- OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -182,6 +184,19 @@ services:
182184
ports:
183185
- "5109:80" # Important: In a production environment your should remove the external port (5109) kept here for microservice debugging purposes.
184186
# The API Gateway redirects and access through the internal port (80).
187+
webhooks.api:
188+
environment:
189+
- ASPNETCORE_ENVIRONMENT=Development
190+
- ASPNETCORE_URLS=http://0.0.0.0:80
191+
- ConnectionString=${ESHOP_AZURE_WEBHOOKS_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=sa;Password=Pass@word}
192+
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
193+
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
194+
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
195+
- IdentityUrl=http://identity.api
196+
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
197+
ports:
198+
- "5113:80" # Important: In a production environment your should remove the external port (5109) kept here for microservice debugging purposes.
199+
# The API Gateway redirects and access through the internal port (80).
185200

186201
mobileshoppingapigw:
187202
environment:
@@ -380,3 +395,13 @@ services:
380395
ports:
381396
- "5100:80"
382397

398+
webhooks.client:
399+
environment:
400+
- ASPNETCORE_URLS=http://0.0.0.0:80
401+
- Token=6168DB8D-DC58-4094-AF24-483278923590 # Webhooks are registered with this token (any value is valid) but the client won't check it
402+
- IdentityUrl=http://10.0.75.1:5105
403+
- CallBackUrl=http://localhost:5114
404+
- WebhooksUrl=http://webhooks.api
405+
- SelfUrl=http://webhooks.client/
406+
ports:
407+
- "5114:80"

‎docker-compose.yml‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ services:
1414
image: rabbitmq:3-management-alpine
1515

1616
identity.api:
17-
image: eshop/identity.api:${TAG:-latest}
17+
image: ${REGISTRY:-eshop}/identity.api:${TAG:-latest}
1818
build:
1919
context: .
2020
dockerfile: src/Services/Identity/Identity.API/Dockerfile
2121
depends_on:
2222
- sql.data
2323

2424
basket.api:
25-
image: eshop/basket.api:${TAG:-latest}
25+
image: ${REGISTRY:-eshop}/basket.api:${TAG:-latest}
2626
build:
2727
context: .
2828
dockerfile: src/Services/Basket/Basket.API/Dockerfile
@@ -32,7 +32,7 @@ services:
3232
- rabbitmq
3333

3434
catalog.api:
35-
image: eshop/catalog.api:${TAG:-latest}
35+
image: ${REGISTRY:-eshop}/catalog.api:${TAG:-latest}
3636
build:
3737
context: .
3838
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
@@ -41,7 +41,7 @@ services:
4141
- rabbitmq
4242

4343
ordering.api:
44-
image: eshop/ordering.api:${TAG:-latest}
44+
image: ${REGISTRY:-eshop}/ordering.api:${TAG:-latest}
4545
build:
4646
context: .
4747
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
@@ -50,7 +50,7 @@ services:
5050
- rabbitmq
5151

5252
ordering.backgroundtasks:
53-
image: eshop/ordering.backgroundtasks:${TAG:-latest}
53+
image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${TAG:-latest}
5454
build:
5555
context: .
5656
dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
@@ -59,7 +59,7 @@ services:
5959
- rabbitmq
6060

6161
marketing.api:
62-
image: eshop/marketing.api:${TAG:-latest}
62+
image: ${REGISTRY:-eshop}/marketing.api:${TAG:-latest}
6363
build:
6464
context: .
6565
dockerfile: src/Services/Marketing/Marketing.API/Dockerfile
@@ -70,24 +70,32 @@ services:
7070
- rabbitmq
7171

7272
payment.api:
73-
image: eshop/payment.api:${TAG:-latest}
73+
image: ${REGISTRY:-eshop}/payment.api:${TAG:-latest}
7474
build:
7575
context: .
7676
dockerfile: src/Services/Payment/Payment.API/Dockerfile
7777
depends_on:
7878
- rabbitmq
7979

8080
locations.api:
81-
image: eshop/locations.api:${TAG:-latest}
81+
image: ${REGISTRY:-eshop}/locations.api:${TAG:-latest}
8282
build:
8383
context: .
8484
dockerfile: src/Services/Location/Locations.API/Dockerfile
8585
depends_on:
8686
- nosql.data
8787
- rabbitmq
8888

89+
webhooks.api:
90+
image: ${REGISTRY:-eshop}/webhooks.api:${TAG:-latest}
91+
build:
92+
context: .
93+
dockerfile: src/Services/Webhooks/Webhooks.API/Dockerfile
94+
depends_on:
95+
- sql.data
96+
8997
mobileshoppingapigw:
90-
image: eshop/ocelotapigw:${TAG:-latest}
98+
image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
9199
build:
92100
context: .
93101
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -102,7 +110,7 @@ services:
102110
- basket.api
103111

104112
mobilemarketingapigw:
105-
image: eshop/ocelotapigw:${TAG:-latest}
113+
image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
106114
build:
107115
context: .
108116
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -117,7 +125,7 @@ services:
117125
- basket.api
118126

119127
webshoppingapigw:
120-
image: eshop/ocelotapigw:${TAG:-latest}
128+
image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
121129
build:
122130
context: .
123131
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -132,7 +140,7 @@ services:
132140
- basket.api
133141

134142
webmarketingapigw:
135-
image: eshop/ocelotapigw:${TAG:-latest}
143+
image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
136144
build:
137145
context: .
138146
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -147,7 +155,7 @@ services:
147155
- basket.api
148156

149157
mobileshoppingagg:
150-
image: eshop/mobileshoppingagg:${TAG:-latest}
158+
image: ${REGISTRY:-eshop}/mobileshoppingagg:${TAG:-latest}
151159
build:
152160
context: .
153161
dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
@@ -162,7 +170,7 @@ services:
162170
- basket.api
163171

164172
webshoppingagg:
165-
image: eshop/webshoppingagg:${TAG:-latest}
173+
image: ${REGISTRY:-eshop}/webshoppingagg:${TAG:-latest}
166174
build:
167175
context: .
168176
dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
@@ -177,7 +185,7 @@ services:
177185
- basket.api
178186

179187
ordering.signalrhub:
180-
image: eshop/ordering.signalrhub:${TAG:-latest}
188+
image: ${REGISTRY:-eshop}/ordering.signalrhub:${TAG:-latest}
181189
build:
182190
context: .
183191
dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile
@@ -192,13 +200,13 @@ services:
192200
- basket.api
193201

194202
webstatus:
195-
image: eshop/webstatus:${TAG:-latest}
203+
image: ${REGISTRY:-eshop}/webstatus:${TAG:-latest}
196204
build:
197205
context: .
198206
dockerfile: src/Web/WebStatus/Dockerfile
199207

200208
webspa:
201-
image: eshop/webspa:${TAG:-latest}
209+
image: ${REGISTRY:-eshop}/webspa:${TAG:-latest}
202210
build:
203211
context: .
204212
dockerfile: src/Web/WebSPA/Dockerfile
@@ -208,7 +216,7 @@ services:
208216
# - webmarketingapigw
209217

210218
webmvc:
211-
image: eshop/webmvc:${TAG:-latest}
219+
image: ${REGISTRY:-eshop}/webmvc:${TAG:-latest}
212220
build:
213221
context: .
214222
dockerfile: src/Web/WebMVC/Dockerfile
@@ -217,3 +225,10 @@ services:
217225
- webshoppingapigw
218226
- webmarketingapigw
219227

228+
webhooks.client:
229+
image: ${REGISTRY:-eshop}/webhooks.client:${TAG:-latest}
230+
build:
231+
context: .
232+
dockerfile: src/Web/WebhookClient/Dockerfile
233+
depends_on:
234+
- webhooks.api

0 commit comments

Comments
 (0)