diff --git a/.github/actions/docker-build-publish/action.yml b/.github/actions/docker-build-publish/action.yml index 1ef6fa0..a83f08f 100644 --- a/.github/actions/docker-build-publish/action.yml +++ b/.github/actions/docker-build-publish/action.yml @@ -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.5.6 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" . + docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.7 -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.5.6 + docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.7 diff --git a/src/Services/Booking/src/Booking.Api/appsettings.docker.json b/src/Services/Booking/src/Booking.Api/appsettings.docker.json index f19e69e..690322f 100644 --- a/src/Services/Booking/src/Booking.Api/appsettings.docker.json +++ b/src/Services/Booking/src/Booking.Api/appsettings.docker.json @@ -26,7 +26,7 @@ "Port": 5672 }, "Jwt": { - "Authority": "http://booking-microservices.com/identity", + "Authority": "http://myidentityserver.com", "Audience": "booking-api", "RequireHttpsMetadata": false }, diff --git a/src/Services/Flight/src/Flight.Api/appsettings.docker.json b/src/Services/Flight/src/Flight.Api/appsettings.docker.json index 5a3ab1e..1a70dc4 100644 --- a/src/Services/Flight/src/Flight.Api/appsettings.docker.json +++ b/src/Services/Flight/src/Flight.Api/appsettings.docker.json @@ -23,7 +23,7 @@ "ConnectionString": "Server=postgres;Port=5432;Database=flight;User Id=postgres;Password=postgres;Include Error Detail=true" }, "Jwt": { - "Authority": "http://booking-microservices.com/identity", + "Authority": "http://myidentityserver.com", "Audience": "flight-api", "RequireHttpsMetadata": false }, diff --git a/src/Services/Identity/src/Identity.Api/appsettings.docker.json b/src/Services/Identity/src/Identity.Api/appsettings.docker.json index 15ef267..6da3cbc 100644 --- a/src/Services/Identity/src/Identity.Api/appsettings.docker.json +++ b/src/Services/Identity/src/Identity.Api/appsettings.docker.json @@ -32,6 +32,14 @@ "Dsn": "", "MinimumBreadcrumbLevel": "information", "MinimumEventLevel":"error" + }, + "Kestrel": { + "Certificates": { + "Default": { + "Path": "/etc/ssl/certs/localhost.pfx", + "Password": "000000" + } + } } }, "AllowedHosts": "*" diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs b/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs index 492a3ed..495f955 100644 --- a/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs +++ b/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs @@ -38,7 +38,7 @@ public static class IdentityServerExtensions .AddResourceOwnerValidator(); //ref: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html - // identityServerBuilder.AddDeveloperSigningCredential(); + identityServerBuilder.AddDeveloperSigningCredential(); return services; } diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs b/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs index cc8eeaf..6a79089 100644 --- a/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs +++ b/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs @@ -115,11 +115,11 @@ public static class InfrastructureExtensions app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name)); - // app.Use((httpContext, next) => - // { - // httpContext.Request.Scheme = "https"; - // return next(); - // }); + app.Use((httpContext, next) => + { + httpContext.Request.Scheme = "https"; + return next(); + }); if (env.IsDevelopment()) { diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json b/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json index a14e7b5..3db6315 100644 --- a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json +++ b/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json @@ -9,7 +9,7 @@ "ConnectionString": "Server=postgres;Port=5432;Database=persist_message;User Id=postgres;Password=postgres;Include Error Detail=true" }, "Jwt": { - "Authority": "http://booking-microservices.com/identity", + "Authority": "http://myidentityserver.com", "Audience": "passenger-api", "RequireHttpsMetadata": false },