elias/booking-microservices
1
0
Fork 0
mirror of https://github.com/meysamhadeli/booking-microservices.git synced 2026-04-14 12:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from meysamhadeli/develop

Browse Source 
chore: Update identity server
This commit is contained in:
Meysam Hadeli 2023-02-22 17:06:47 +03:30 committed by GitHub
commit 1395a97ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 179 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/docker-build-publish/action.yml vendored
View File

@ -43,11 +43,11 @@ runs:
if: ${{ github.ref == 'refs/heads/main' && success() }}
shell: bash
run: |
docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.6.3 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" .
docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.6.4 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" .
- name: Publish Docker Image
if: ${{ github.ref == 'refs/heads/main' && success() }}
shell: bash
run: |
docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.6.3
docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.6.4

335
deployments/docker-compose/docker-compose.yaml
View File

@ -1,166 +1,7 @@
version: "3.3"
services:
#######################################################
# Gateway
#######################################################
gateway:
image: gateway
build:
args:
Version: "1"
context: ../../
dockerfile: src/ApiGateway/Dockerfile
container_name: booking-gateway
ports:
- "5001:80"
- "5000:443"
depends_on:
- postgres
- rabbitmq
- jaeger
- elasticsearch
- kibana
volumes:
- ~/.aspnet/https:/https:ro
environment:
- 'ASPNETCORE_URLS=https://+;http://+'
- ASPNETCORE_HTTPS_PORT=5001
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
#######################################################
# Flight
#######################################################
flight:
image: flight
build:
args:
Version: "1"
context: ../../
dockerfile: src/Services/Flight/Dockerfile
container_name: flight
ports:
- 5004:80
- 5003:443
depends_on:
- postgres
- rabbitmq
- jaeger
- elasticsearch
- kibana
- mongo
volumes:
- ~/.aspnet/https:/https:ro
environment:
- 'ASPNETCORE_URLS=https://+;http://+'
- ASPNETCORE_HTTPS_PORT=5003
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
#######################################################
# Identity
#######################################################
identity:
image: identity
build:
args:
Version: "1"
context: ../../
dockerfile: src/Services/Identity/Dockerfile
container_name: identity
ports:
- 6005:80
- 5005:443
depends_on:
- postgres
- rabbitmq
- jaeger
- elasticsearch
- kibana
volumes:
- ~/.aspnet/https:/https:ro
environment:
- 'ASPNETCORE_URLS=https://+;http://+'
- ASPNETCORE_HTTPS_PORT=5005
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
#######################################################
# Passenger
#######################################################
passenger:
image: passenger
build:
args:
Version: "1"
context: ../../
dockerfile: src/Services/Passenger/Dockerfile
container_name: passenger
ports:
- 6012:80
- 5012:443
depends_on:
- postgres
- rabbitmq
- jaeger
- elasticsearch
- kibana
- mongo
volumes:
- ~/.aspnet/https:/https:ro
environment:
- 'ASPNETCORE_URLS=https://+;http://+'
- ASPNETCORE_HTTPS_PORT=5012
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
#######################################################
# Booking
#######################################################
booking:
image: booking
build:
args:
Version: "1"
context: ../../
dockerfile: src/Services/Booking/Dockerfile
container_name: booking
ports:
- 6010:80
- 5010:443
depends_on:
- postgres
- rabbitmq
- jaeger
- eventstore
- elasticsearch
- kibana
- mongo
volumes:
- ~/.aspnet/https:/https:ro
environment:
- 'ASPNETCORE_URLS=https://+;http://+'
- ASPNETCORE_HTTPS_PORT=5010
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
######################################################
######################################################
# Postgres
######################################################
postgres:
@ -266,9 +107,9 @@ services:
networks:
- booking
#######################################################
#######################################################
# Kibana
#######################################################
#######################################################
kibana:
container_name: kibana
image: kibana:7.17.9
@ -283,6 +124,176 @@ services:
- booking
#######################################################
# Gateway
#######################################################
# gateway:
# image: gateway
# build:
# args:
# Version: "1"
# context: ../../
# dockerfile: src/ApiGateway/Dockerfile
# container_name: booking-gateway
# ports:
# - "5001:80"
# - "5000:443"
# depends_on:
# - postgres
# - rabbitmq
# - jaeger
# - elasticsearch
# - kibana
# volumes:
# - ~/.aspnet/https:/https:ro
# environment:
# - ASPNETCORE_ENVIRONMENT=docker
# - ASPNETCORE_URLS=https://+;http://+
# - ASPNETCORE_HTTPS_PORT=5001
# - ASPNETCORE_Kestrel__Certificates__Default__Password=password
# - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
# networks:
# - booking
#######################################################
# Flight
#######################################################
flight:
image: flight
build:
args:
Version: "1"
context: ../../
dockerfile: src/Services/Flight/Dockerfile
container_name: flight
ports:
- 5004:80
- 5003:443
depends_on:
- postgres
- rabbitmq
- jaeger
- elasticsearch
- kibana
- mongo
- identity
volumes:
- ~/.aspnet/https:/https:ro
environment:
- ASPNETCORE_ENVIRONMENT=docker
- ASPNETCORE_URLS=https://+;http://+
- ASPNETCORE_HTTPS_PORT=5003
- ASPNETCORE_HTTP_PORT=5004
- Jwt__Authority=http://host.docker.internal:6005
- Jwt__Audience=flight-api
- Jwt__RequireHttpsMetadata=false
- Jwt__MetadataAddress=http://host.docker.internal:6005/.well-known/openid-configuration
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
#######################################################
# Identity
#######################################################
identity:
image: identity
build:
args:
Version: "1"
context: ../../
dockerfile: src/Services/Identity/Dockerfile
container_name: identity
ports:
- 6005:80
- 5005:443
depends_on:
- postgres
- rabbitmq
- jaeger
- elasticsearch
- kibana
volumes:
- ~/.aspnet/https:/https:ro
environment:
- ASPNETCORE_ENVIRONMENT=docker
- ASPNETCORE_URLS=https://+;http://+
- ASPNETCORE_HTTPS_PORT=5005
- ASPNETCORE_HTTP_PORT=6005
- ASPNETCORE_Kestrel__Certificates__Default__Password=password
- ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
networks:
- booking
#######################################################
# Passenger
#######################################################
# passenger:
# image: passenger
# build:
# args:
# Version: "1"
# context: ../../
# dockerfile: src/Services/Passenger/Dockerfile
# container_name: passenger
# ports:
# - 6012:80
# - 5012:443
# depends_on:
# - postgres
# - rabbitmq
# - jaeger
# - elasticsearch
# - kibana
# - mongo
# volumes:
# - ~/.aspnet/https:/https:ro
# environment:
# - ASPNETCORE_ENVIRONMENT=docker
# - ASPNETCORE_URLS=https://+;http://+
# - ASPNETCORE_HTTPS_PORT=5012
# - ASPNETCORE_Kestrel__Certificates__Default__Password=password
# - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
# networks:
# - booking
#######################################################
# Booking
#######################################################
# booking:
# image: booking
# build:
# args:
# Version: "1"
# context: ../../
# dockerfile: src/Services/Booking/Dockerfile
# container_name: booking
# ports:
# - 6010:80
# - 5010:443
# depends_on:
# - postgres
# - rabbitmq
# - jaeger
# - eventstore
# - elasticsearch
# - kibana
# - mongo
# volumes:
# - ~/.aspnet/https:/https:ro
# environment:
# - ASPNETCORE_ENVIRONMENT=docker
# - ASPNETCORE_URLS=https://+;http://+
# - ASPNETCORE_HTTPS_PORT=5010
# - ASPNETCORE_Kestrel__Certificates__Default__Password=password
# - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx
# networks:
# - booking
networks:
booking:

4
deployments/k8s/flight.yml
View File

@ -39,11 +39,13 @@ spec:
- name: "MongoOptions__DatabaseName"
value: "flight-db"
- name: "Jwt__Authority"
value: "http://10.0.75.1:13926/"
value: "http://127.0.0.1:7914"
- name: "Jwt__Audience"
value: "flight-api"
- name: "Jwt__RequireHttpsMetadata"
value: "false"
- name: "Jwt__MetadataAddress"
value: "flight/.well-known/openid-configuration"
# - name: "HealthOptions__Enabled"
# value: "true"
volumeMounts:

2
src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs
View File

@ -38,7 +38,7 @@ public static class IdentityServerExtensions
.AddResourceOwnerValidator<UserValidator>();
//ref: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html
identityServerBuilder.AddDeveloperSigningCredential();
// identityServerBuilder.AddDeveloperSigningCredential();
return services;
}