Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: status page #26

Merged
merged 13 commits into from
Jan 13, 2023
Merged

feat: status page #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d4e89b2
fix: remove smalltalk
brunobritodev Apr 25, 2022
a09b45b
fix: smalltalk try 2
brunobritodev Apr 25, 2022
53cabab
Update .gitattributes
brunobritodev Apr 26, 2022
e7fcb56
fix: removing smalltalk
brunobritodev Apr 26, 2022
ea2092b
fix: copy hook
brunobritodev Jan 4, 2023
f0c6f8f
feat: disable https redirection
brunobritodev Jan 5, 2023
ff94892
Merge branch 'desenvolvedor-io:main' into main
brunobritodev Jan 5, 2023
9b8e635
chore: merge
brunobritodev Jan 5, 2023
e0afe80
fix: connection error
brunobritodev Jan 5, 2023
f61a995
chore: merge
brunobritodev Jan 5, 2023
f9e1bdc
feat: status page, ssl changes
brunobritodev Jan 13, 2023
e877ee1
chore: merge
brunobritodev Jan 13, 2023
3a71da1
fix: remove crt
brunobritodev Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified DevStore.sln
View file
Open in desktop
Binary file not shown.
62 changes: 42 additions & 20 deletions docker/docker-compose-local-light.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ services:
dockerfile: ./web/DevStore.WebApp.MVC/Dockerfile
restart: always
environment:
- ASPNETCORE_ENVIRONMENT=Docker
- ASPNETCORE_URLS=http://*:5001
- LC_ALL=en_US.UTF-8
- LANG=en_US.UTF-8
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: "https://+:443;http://+:80"
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
LC_ALL: "en_US.UTF-8"
LANG: "en_US.UTF-8"
# Change the two lines above to your culture (ex pt_BR)
volumes:
- dpkeys:/var/data_protection_keys/
- ./certs:/https:ro
depends_on:
- api-catalog
- api-identity
Expand All @@ -28,7 +30,9 @@ services:
image: rabbitmq:3-management
container_name: devstore-rabbit
expose:
ports:
- 5672
- 15672
environment:
RABBITMQ_DEFAULT_USER: "devstore"
RABBITMQ_DEFAULT_PASS: "devstore"
Expand All @@ -45,14 +49,14 @@ services:

api-identity:
image: desenvolvedorio/devstore-api-identity:latest
container_name: devstore-api-identity
container_name: devstore-api-identity
build:
context: ../src
dockerfile: ./services/DevStore.Identity.API/Dockerfile
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5101;http://+5102
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSUsers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -73,7 +77,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5201;http://+5202
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSShoppingCart;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -95,7 +99,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5301;http://+5302
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSCatalog;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -116,7 +120,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5401;http://+5402
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSCustomers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -138,7 +142,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5501;http://+5502
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
volumes:
Expand All @@ -160,7 +164,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5601;http://+5602
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSBilling;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -183,7 +187,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5701;http://+5702
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSOrders;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -196,6 +200,27 @@ services:
- api-identity
- generate-pfx

web-status:
image: desenvolvedorio/devstore-web-status:latest
container_name: devstore-web-status
build:
context: ../src
dockerfile: ./web/DevStore.WebApp.Status/Dockerfile
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:443;http://+:80
CUSTOMCONNSTR_DefaultConnection: "Server=database-devstore;Database=DSStatus;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
AppSettings__DatabaseType: SqlServer
USE_HTTPS_REDIRECTION: "false"
volumes:
- ./certs:/https:ro
depends_on:
- database-devstore


generate-pfx:
image: emberstack/openssl
container_name: generate-pfx
Expand All @@ -207,13 +232,10 @@ services:
openssl genrsa -out devstore.rsa 2048 &&
openssl req -sha256 -new -key devstore.rsa -out devstore.csr -subj '/CN=localhost' &&
openssl x509 -req -sha256 -days 365 -in devstore.csr -signkey devstore.rsa -out devstore.crt &&
openssl pkcs12 -export -out /https/devstore.academy-localhost.pfx -inkey devstore.rsa -in devstore.crt -password pass:9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe &&
rm devstore.rsa devstore.csr devstore.crt)"
openssl pkcs12 -export -out /https/devstore.academy-localhost.pfx -inkey devstore.rsa -in devstore.crt -password pass:9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe)"

seq:
image: datalust/seq:latest
expose:
- 5341
ports:
- 5341:80
environment:
Expand All @@ -230,9 +252,9 @@ services:
ports:
- "7500:80"
- "7501:443"
- "7510:8080"
- "7511:4443"
depends_on:
- web-mvc

volumes:
dpkeys:


62 changes: 47 additions & 15 deletions docker/docker-compose-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ services:
dockerfile: ./web/DevStore.WebApp.MVC/Dockerfile
restart: always
environment:
- ASPNETCORE_ENVIRONMENT=Docker
- ASPNETCORE_URLS=http://*:5001
- LC_ALL=en_US.UTF-8
- LANG=en_US.UTF-8
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: "https://+:443;http://+:80"
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
LC_ALL: "en_US.UTF-8"
LANG: "en_US.UTF-8"
# Change the two lines above to your culture (ex pt_BR)
volumes:
- dpkeys:/var/data_protection_keys/
- ./certs:/https:ro
depends_on:
- api-catalog
- api-identity
Expand Down Expand Up @@ -53,7 +55,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5101;http://+5102
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-identity;Database=DSUsers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand Down Expand Up @@ -83,7 +85,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5201;http://+5202
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-cart;Database=DSShoppingCart;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand Down Expand Up @@ -114,7 +116,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5301;http://+5302
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-catalog;Database=DSCatalog;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand Down Expand Up @@ -144,7 +146,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5401;http://+5402
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-customers;Database=DSCustomers;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -166,7 +168,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5501;http://+5502
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
volumes:
Expand Down Expand Up @@ -198,11 +200,11 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5601;http://+5602
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-billing;Port=5432;Database=DSBilling;User Id=sa;Password=MyDB@123"
AppSettings__DatabaseType: Postgre
AppSettings__DatabaseType: SqlServer
volumes:
- ./certs:/https:ro
depends_on:
Expand Down Expand Up @@ -230,7 +232,7 @@ services:
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:5701;http://+5702
ASPNETCORE_URLS: https://+:443;http://+:80
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
CUSTOMCONNSTR_DefaultConnection: "Server=database-order;Database=DSOrders;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
Expand All @@ -252,6 +254,38 @@ services:
environment:
ACCEPT_EULA: "Y"


database-status:
image: mcr.microsoft.com/mssql/server:2017-latest
container_name: devstore-database-status
expose:
- 1433
environment:
SA_PASSWORD: "MyDB@123"
ACCEPT_EULA: "Y"


web-status:
image: desenvolvedorio/devstore-web-status:latest
container_name: devstore-web-status
build:
context: ../src
dockerfile: ./web/DevStore.WebApp.Status/Dockerfile
restart: always
environment:
ASPNETCORE_ENVIRONMENT: Docker
ASPNETCORE_URLS: https://+:443;http://+:80
CUSTOMCONNSTR_DefaultConnection: "Server=database-status;Database=DSOrders;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
ASPNETCORE_Kestrel__Certificates__Default__Password: 9HoGMnb7Lu8NFdHBz4Vq2rtKivzMhmMXhtvuB4TZcLMmbWfFmDQCjJeLURAJ4GYe
ASPNETCORE_Kestrel__Certificates__Default__Path: /https/devstore.academy-localhost.pfx
AppSettings__DatabaseType: SqlServer
USE_HTTPS_REDIRECTION: "false"
volumes:
- ./certs:/https:ro
- ./certs/devstore.crt:/usr/local/share/ca-certificates/devstore.crt
depends_on:
- database-status

# This service is used to generate the PFX file for gRPC communication
generate-pfx:
image: emberstack/openssl
Expand Down Expand Up @@ -280,6 +314,4 @@ services:
depends_on:
- web-mvc

volumes:
dpkeys:

Loading