Skip to content

Commit f2a867a

Browse files
brunobritodevbrunobritodev
authored
feat: status page (#26)
* fix: remove smalltalk * fix: smalltalk try 2 * Update .gitattributes * fix: removing smalltalk * fix: copy hook * feat: disable https redirection * fix: connection error * feat: status page, ssl changes * fix: remove crt
1 parent 365fa66 commit f2a867a

File tree

65 files changed

+669
-126
lines changed

Some content is hidden

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

65 files changed

+669
-126
lines changed

‎DevStore.sln‎

-11.7 KB
Binary file not shown.

‎docker/docker-compose-local-light.yml‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ services:
1010
dockerfile: ./web/DevStore.WebApp.MVC/Dockerfile
1111
restart: always
1212
environment:
13-
- ASPNETCORE_ENVIRONMENT=Docker
14-
- ASPNETCORE_URLS=http://*:5001
15-
- LC_ALL=en_US.UTF-8
16-
- LANG=en_US.UTF-8
13+
ASPNETCORE_ENVIRONMENT: Docker
14+
ASPNETCORE_URLS: "https://+:443;http://+:80"
15+
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
16+
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
17+
LC_ALL: "en_US.UTF-8"
18+
LANG: "en_US.UTF-8"
1719
# Change the two lines above to your culture (ex pt_BR)
1820
volumes:
19-
- dpkeys:/var/data_protection_keys/
21+
- ./certs:/https:ro
2022
depends_on:
2123
- api-catalog
2224
- api-identity
@@ -28,7 +30,9 @@ services:
2830
image: rabbitmq:3-management
2931
container_name: devstore-rabbit
3032
expose:
33+
ports:
3134
- 5672
35+
- 15672
3236
environment:
3337
RABBITMQ_DEFAULT_USER: "devstore"
3438
RABBITMQ_DEFAULT_PASS: "devstore"
@@ -45,14 +49,14 @@ services:
4549

4650
api-identity:
4751
image: desenvolvedorio/devstore-api-identity:latest
48-
container_name: devstore-api-identity
52+
container_name: devstore-api-identity
4953
build:
5054
context: ../src
5155
dockerfile: ./services/DevStore.Identity.API/Dockerfile
5256
restart: always
5357
environment:
5458
ASPNETCORE_ENVIRONMENT: Docker
55-
ASPNETCORE_URLS: https://+:5101;http://+5102
59+
ASPNETCORE_URLS: https://+:443;http://+:80
5660
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
5761
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
5862
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSUsers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -73,7 +77,7 @@ services:
7377
restart: always
7478
environment:
7579
ASPNETCORE_ENVIRONMENT: Docker
76-
ASPNETCORE_URLS: https://+:5201;http://+5202
80+
ASPNETCORE_URLS: https://+:443;http://+:80
7781
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
7882
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
7983
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSShoppingCart;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -95,7 +99,7 @@ services:
9599
restart: always
96100
environment:
97101
ASPNETCORE_ENVIRONMENT: Docker
98-
ASPNETCORE_URLS: https://+:5301;http://+5302
102+
ASPNETCORE_URLS: https://+:443;http://+:80
99103
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
100104
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
101105
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSCatalog;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -116,7 +120,7 @@ services:
116120
restart: always
117121
environment:
118122
ASPNETCORE_ENVIRONMENT: Docker
119-
ASPNETCORE_URLS: https://+:5401;http://+5402
123+
ASPNETCORE_URLS: https://+:443;http://+:80
120124
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
121125
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
122126
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSCustomers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -138,7 +142,7 @@ services:
138142
restart: always
139143
environment:
140144
ASPNETCORE_ENVIRONMENT: Docker
141-
ASPNETCORE_URLS: https://+:5501;http://+5502
145+
ASPNETCORE_URLS: https://+:443;http://+:80
142146
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
143147
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
144148
volumes:
@@ -160,7 +164,7 @@ services:
160164
restart: always
161165
environment:
162166
ASPNETCORE_ENVIRONMENT: Docker
163-
ASPNETCORE_URLS: https://+:5601;http://+5602
167+
ASPNETCORE_URLS: https://+:443;http://+:80
164168
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
165169
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
166170
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSBilling;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -183,7 +187,7 @@ services:
183187
restart: always
184188
environment:
185189
ASPNETCORE_ENVIRONMENT: Docker
186-
ASPNETCORE_URLS: https://+:5701;http://+5702
190+
ASPNETCORE_URLS: https://+:443;http://+:80
187191
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
188192
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
189193
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSOrders;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -196,6 +200,27 @@ services:
196200
- api-identity
197201
- generate-pfx
198202

203+
web-status:
204+
image: desenvolvedorio/devstore-web-status:latest
205+
container_name: devstore-web-status
206+
build:
207+
context: ../src
208+
dockerfile: ./web/DevStore.WebApp.Status/Dockerfile
209+
restart: always
210+
environment:
211+
ASPNETCORE_ENVIRONMENT: Docker
212+
ASPNETCORE_URLS: https://+:443;http://+:80
213+
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSStatus;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
214+
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
215+
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
216+
AppSettings__DatabaseType: SqlServer
217+
USE_HTTPS_REDIRECTION: "false"
218+
volumes:
219+
- ./certs:/https:ro
220+
depends_on:
221+
- database-devstore
222+
223+
199224
generate-pfx:
200225
image: emberstack/openssl
201226
container_name: generate-pfx
@@ -207,13 +232,10 @@ services:
207232
openssl genrsa -out devstore.rsa 2048 &&
208233
openssl req -sha256 -new -key devstore.rsa -out devstore.csr -subj '/CN=localhost' &&
209234
openssl x509 -req -sha256 -days 365 -in devstore.csr -signkey devstore.rsa -out devstore.crt &&
210-
openssl pkcs12 -export -out /https/devstore.academy-localhost.pfx -inkey devstore.rsa -in devstore.crt -password pass:9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe &&
211-
rm devstore.rsa devstore.csr devstore.crt)"
235+
openssl pkcs12 -export -out /https/devstore.academy-localhost.pfx -inkey devstore.rsa -in devstore.crt -password pass:9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe)"
212236
213237
seq:
214238
image: datalust/seq:latest
215-
expose:
216-
- 5341
217239
ports:
218240
- 5341:80
219241
environment:
@@ -230,9 +252,9 @@ services:
230252
ports:
231253
- "7500:80"
232254
- "7501:443"
255+
- "7510:8080"
256+
- "7511:4443"
233257
depends_on:
234258
- web-mvc
235259

236-
volumes:
237-
dpkeys:
238-
260+

‎docker/docker-compose-local.yml‎

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ services:
1010
dockerfile: ./web/DevStore.WebApp.MVC/Dockerfile
1111
restart: always
1212
environment:
13-
- ASPNETCORE_ENVIRONMENT=Docker
14-
- ASPNETCORE_URLS=http://*:5001
15-
- LC_ALL=en_US.UTF-8
16-
- LANG=en_US.UTF-8
13+
ASPNETCORE_ENVIRONMENT: Docker
14+
ASPNETCORE_URLS: "https://+:443;http://+:80"
15+
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
16+
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
17+
LC_ALL: "en_US.UTF-8"
18+
LANG: "en_US.UTF-8"
1719
# Change the two lines above to your culture (ex pt_BR)
1820
volumes:
19-
- dpkeys:/var/data_protection_keys/
21+
- ./certs:/https:ro
2022
depends_on:
2123
- api-catalog
2224
- api-identity
@@ -53,7 +55,7 @@ services:
5355
restart: always
5456
environment:
5557
ASPNETCORE_ENVIRONMENT: Docker
56-
ASPNETCORE_URLS: https://+:5101;http://+5102
58+
ASPNETCORE_URLS: https://+:443;http://+:80
5759
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
5860
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
5961
CUSTOMCONNSTR_DefaultConnection: "Server=database-identity;Database=DSUsers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -83,7 +85,7 @@ services:
8385
restart: always
8486
environment:
8587
ASPNETCORE_ENVIRONMENT: Docker
86-
ASPNETCORE_URLS: https://+:5201;http://+5202
88+
ASPNETCORE_URLS: https://+:443;http://+:80
8789
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
8890
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
8991
CUSTOMCONNSTR_DefaultConnection: "Server=database-cart;Database=DSShoppingCart;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -114,7 +116,7 @@ services:
114116
restart: always
115117
environment:
116118
ASPNETCORE_ENVIRONMENT: Docker
117-
ASPNETCORE_URLS: https://+:5301;http://+5302
119+
ASPNETCORE_URLS: https://+:443;http://+:80
118120
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
119121
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
120122
CUSTOMCONNSTR_DefaultConnection: "Server=database-catalog;Database=DSCatalog;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -144,7 +146,7 @@ services:
144146
restart: always
145147
environment:
146148
ASPNETCORE_ENVIRONMENT: Docker
147-
ASPNETCORE_URLS: https://+:5401;http://+5402
149+
ASPNETCORE_URLS: https://+:443;http://+:80
148150
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
149151
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
150152
CUSTOMCONNSTR_DefaultConnection: "Server=database-customers;Database=DSCustomers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -166,7 +168,7 @@ services:
166168
restart: always
167169
environment:
168170
ASPNETCORE_ENVIRONMENT: Docker
169-
ASPNETCORE_URLS: https://+:5501;http://+5502
171+
ASPNETCORE_URLS: https://+:443;http://+:80
170172
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
171173
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
172174
volumes:
@@ -198,11 +200,11 @@ services:
198200
restart: always
199201
environment:
200202
ASPNETCORE_ENVIRONMENT: Docker
201-
ASPNETCORE_URLS: https://+:5601;http://+5602
203+
ASPNETCORE_URLS: https://+:443;http://+:80
202204
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
203205
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
204206
CUSTOMCONNSTR_DefaultConnection: "Server=database-billing;Port=5432;Database=DSBilling;User Id=sa;Password=MyDB@123"
205-
AppSettings__DatabaseType: Postgre
207+
AppSettings__DatabaseType: SqlServer
206208
volumes:
207209
- ./certs:/https:ro
208210
depends_on:
@@ -230,7 +232,7 @@ services:
230232
restart: always
231233
environment:
232234
ASPNETCORE_ENVIRONMENT: Docker
233-
ASPNETCORE_URLS: https://+:5701;http://+5702
235+
ASPNETCORE_URLS: https://+:443;http://+:80
234236
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
235237
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
236238
CUSTOMCONNSTR_DefaultConnection: "Server=database-order;Database=DSOrders;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
@@ -252,6 +254,38 @@ services:
252254
environment:
253255
ACCEPT_EULA: "Y"
254256

257+
258+
database-status:
259+
image: mcr.microsoft.com/mssql/server:2017-latest
260+
container_name: devstore-database-status
261+
expose:
262+
- 1433
263+
environment:
264+
SA_PASSWORD: "MyDB@123"
265+
ACCEPT_EULA: "Y"
266+
267+
268+
web-status:
269+
image: desenvolvedorio/devstore-web-status:latest
270+
container_name: devstore-web-status
271+
build:
272+
context: ../src
273+
dockerfile: ./web/DevStore.WebApp.Status/Dockerfile
274+
restart: always
275+
environment:
276+
ASPNETCORE_ENVIRONMENT: Docker
277+
ASPNETCORE_URLS: https://+:443;http://+:80
278+
CUSTOMCONNSTR_DefaultConnection: "Server=database-status;Database=DSOrders;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
279+
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
280+
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
281+
AppSettings__DatabaseType: SqlServer
282+
USE_HTTPS_REDIRECTION: "false"
283+
volumes:
284+
- ./certs:/https:ro
285+
- ./certs/devstore.crt:/usr/local/share/ca-certificates/devstore.crt
286+
depends_on:
287+
- database-status
288+
255289
# This service is used to generate the PFX file for gRPC communication
256290
generate-pfx:
257291
image: emberstack/openssl
@@ -280,6 +314,4 @@ services:
280314
depends_on:
281315
- web-mvc
282316

283-
volumes:
284-
dpkeys:
285317

0 commit comments

Comments
 (0)