elias/booking-microservices
1
0
Fork 0
mirror of https://github.com/meysamhadeli/booking-microservices.git synced 2026-04-24 05:30:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #188 from meysamhadeli/develop

Browse Source 
chore: Update identity server
This commit is contained in:
Meysam Hadeli 2023-02-14 05:17:16 +03:30 committed by GitHub
commit 342a738152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 25 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() }} if: ${{ github.ref == 'refs/heads/main' && success() }}
shell: bash shell: bash
run: | run: |
docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.7 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" . docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.8 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" .
- name: Publish Docker Image - name: Publish Docker Image
if: ${{ github.ref == 'refs/heads/main' && success() }} if: ${{ github.ref == 'refs/heads/main' && success() }}
shell: bash shell: bash
run: | run: |
docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.7 docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.8

9
src/Services/Booking/Dockerfile
View File

@ -1,8 +1,7 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder
WORKDIR /app WORKDIR /
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/ COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
COPY ./src/Services/Booking/src/Booking/Booking.csproj ./Services/Booking/src/Booking/ COPY ./src/Services/Booking/src/Booking/Booking.csproj ./Services/Booking/src/Booking/
COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./Services/Booking/src/Booking.Api/ COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./Services/Booking/src/Booking.Api/
@ -22,7 +21,7 @@ COPY ./src/Services/Booking/src/Booking.Api/ ./Services/Booking/src/Booking.Api
RUN ls RUN ls
RUN dotnet build -c Release --no-restore ./Services/Booking/src/Booking.Api/Booking.Api.csproj RUN dotnet build -c Release --no-restore ./Services/Booking/src/Booking.Api/Booking.Api.csproj
WORKDIR /app/Services/Booking/src/Booking.Api WORKDIR /Services/Booking/src/Booking.Api
# Publish project to output folder # Publish project to output folder
# and no build, as we did it already # and no build, as we did it already
@ -31,8 +30,8 @@ RUN dotnet publish -c Release --no-build -o out
FROM mcr.microsoft.com/dotnet/aspnet:7.0 FROM mcr.microsoft.com/dotnet/aspnet:7.0
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app WORKDIR /
COPY --from=builder /app/Services/Booking/src/Booking.Api/out . COPY --from=builder /Services/Booking/src/Booking.Api/out .
ENV ASPNETCORE_URLS https://*:5010, http://*:6010 ENV ASPNETCORE_URLS https://*:5010, http://*:6010
ENV ASPNETCORE_ENVIRONMENT docker ENV ASPNETCORE_ENVIRONMENT docker

9
src/Services/Flight/Dockerfile
View File

@ -1,8 +1,7 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder
WORKDIR /app WORKDIR /
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/ COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
COPY ./src/Services/Flight/src/Flight/Flight.csproj ./Services/Flight/src/Flight/ COPY ./src/Services/Flight/src/Flight/Flight.csproj ./Services/Flight/src/Flight/
COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./Services/Flight/src/Flight.Api/ COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./Services/Flight/src/Flight.Api/
@ -22,7 +21,7 @@ COPY ./src/Services/Flight/src/Flight.Api/ ./Services/Flight/src/Flight.Api/
RUN ls RUN ls
RUN dotnet build -c Release --no-restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj RUN dotnet build -c Release --no-restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj
WORKDIR /app/Services/Flight/src/Flight.Api WORKDIR /Services/Flight/src/Flight.Api
# Publish project to output folder # Publish project to output folder
# and no build, as we did it already # and no build, as we did it already
@ -31,8 +30,8 @@ RUN dotnet publish -c Release --no-build -o out
FROM mcr.microsoft.com/dotnet/aspnet:7.0 FROM mcr.microsoft.com/dotnet/aspnet:7.0
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app WORKDIR /
COPY --from=builder /app/Services/Flight/src/Flight.Api/out . COPY --from=builder /Services/Flight/src/Flight.Api/out .
ENV ASPNETCORE_URLS https://*:5003,http://*:5004 ENV ASPNETCORE_URLS https://*:5003,http://*:5004

10
src/Services/Identity/Dockerfile
View File

@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder
WORKDIR /app
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app WORKDIR /
COPY ./src/Services/Identity/cert/localhost.pfx ./localhost.pfx
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/ COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
COPY ./src/Services/Identity/src/Identity/Identity.csproj ./Services/Identity/src/Identity/ COPY ./src/Services/Identity/src/Identity/Identity.csproj ./Services/Identity/src/Identity/
COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./Services/Identity/src/Identity.Api/ COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./Services/Identity/src/Identity.Api/
@ -22,7 +22,7 @@ COPY ./src/Services/Identity/src/Identity.Api/ ./Services/Identity/src/Identity
RUN ls RUN ls
RUN dotnet build -c Release --no-restore ./Services/Identity/src/Identity.Api/Identity.Api.csproj RUN dotnet build -c Release --no-restore ./Services/Identity/src/Identity.Api/Identity.Api.csproj
WORKDIR /app/Services/Identity/src/Identity.Api WORKDIR /Services/Identity/src/Identity.Api
# Publish project to output folder # Publish project to output folder
# and no build, as we did it already # and no build, as we did it already
@ -31,8 +31,8 @@ RUN dotnet publish -c Release --no-build -o out
FROM mcr.microsoft.com/dotnet/aspnet:7.0 FROM mcr.microsoft.com/dotnet/aspnet:7.0
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app WORKDIR /
COPY --from=builder /app/Services/Identity/src/Identity.Api/out . COPY --from=builder /Services/Identity/src/Identity.Api/out .
ENV ASPNETCORE_URLS https://*:5005, http://*:6005 ENV ASPNETCORE_URLS https://*:5005, http://*:6005
ENV ASPNETCORE_ENVIRONMENT docker ENV ASPNETCORE_ENVIRONMENT docker

2
src/Services/Identity/src/Identity.Api/appsettings.docker.json
View File

@ -36,7 +36,7 @@
"Kestrel": { "Kestrel": {
"Certificates": { "Certificates": {
"Default": { "Default": {
"Path": "/etc/ssl/certs/localhost.pfx", "Path": "./localhost.pfx",
"Password": "000000" "Password": "000000"
} }
} }

9
src/Services/Passenger/Dockerfile
View File

@ -1,8 +1,7 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder
WORKDIR /app WORKDIR /
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/ COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
COPY ./src/Services/Passenger/src/Passenger/Passenger.csproj ./Services/Passenger/src/Passenger/ COPY ./src/Services/Passenger/src/Passenger/Passenger.csproj ./Services/Passenger/src/Passenger/
COPY ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./Services/Passenger/src/Passenger.Api/ COPY ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./Services/Passenger/src/Passenger.Api/
@ -22,7 +21,7 @@ COPY ./src/Services/Passenger/src/Passenger.Api/ ./Services/Passenger/src/Passe
RUN ls RUN ls
RUN dotnet build -c Release --no-restore ./Services/Passenger/src/Passenger.Api/Passenger.Api.csproj RUN dotnet build -c Release --no-restore ./Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
WORKDIR /app/Services/Passenger/src/Passenger.Api WORKDIR /Services/Passenger/src/Passenger.Api
# Publish project to output folder # Publish project to output folder
# and no build, as we did it already # and no build, as we did it already
@ -31,8 +30,8 @@ RUN dotnet publish -c Release --no-build -o out
FROM mcr.microsoft.com/dotnet/aspnet:7.0 FROM mcr.microsoft.com/dotnet/aspnet:7.0
# Setup working directory for the project # Setup working directory for the project
WORKDIR /app WORKDIR /
COPY --from=builder /app/Services/Passenger/src/Passenger.Api/out . COPY --from=builder /Services/Passenger/src/Passenger.Api/out .
ENV ASPNETCORE_URLS https://*:5012, http://*:6012 ENV ASPNETCORE_URLS https://*:5012, http://*:6012
ENV ASPNETCORE_ENVIRONMENT docker ENV ASPNETCORE_ENVIRONMENT docker