diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..4cfbb108 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,64 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto +*.sh text eol=lf + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain \ No newline at end of file diff --git a/src/ApiGateway/Dockerfile b/src/ApiGateway/Dockerfile index bb2bb8b9..74ebf6d6 100644 --- a/src/ApiGateway/Dockerfile +++ b/src/ApiGateway/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -29,7 +29,7 @@ WORKDIR /ApiGateway/src # and no build, as we did it already RUN dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/ApiGateway/dev.Dockerfile b/src/ApiGateway/dev.Dockerfile index dcea6820..42d5f082 100644 --- a/src/ApiGateway/dev.Dockerfile +++ b/src/ApiGateway/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -32,7 +32,7 @@ WORKDIR /ApiGateway/src RUN --mount=type=cache,id=gateway_nuget,target=/root/.nuget/packages \ dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Booking/Dockerfile b/src/Services/Booking/Dockerfile index b6a88ca1..15b7f4a4 100644 --- a/src/Services/Booking/Dockerfile +++ b/src/Services/Booking/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -31,7 +31,7 @@ WORKDIR /Services/Booking/src/Booking.Api # and no build, as we did it already RUN dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Booking/dev.Dockerfile b/src/Services/Booking/dev.Dockerfile index 4efa0b0b..6fb5f852 100644 --- a/src/Services/Booking/dev.Dockerfile +++ b/src/Services/Booking/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -34,7 +34,7 @@ WORKDIR /Services/Booking/src/Booking.Api RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages\ dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Flight/Dockerfile b/src/Services/Flight/Dockerfile index 727dc0d6..9581cb87 100644 --- a/src/Services/Flight/Dockerfile +++ b/src/Services/Flight/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -31,7 +31,7 @@ WORKDIR /Services/Flight/src/Flight.Api # and no build, as we did it already RUN dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Flight/dev.Dockerfile b/src/Services/Flight/dev.Dockerfile index 8f623ca5..ddfcd04e 100644 --- a/src/Services/Flight/dev.Dockerfile +++ b/src/Services/Flight/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -34,7 +34,7 @@ WORKDIR /Services/Flight/src/Flight.Api RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \ dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Identity/Dockerfile b/src/Services/Identity/Dockerfile index 71802165..df279090 100644 --- a/src/Services/Identity/Dockerfile +++ b/src/Services/Identity/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder # Setup working directory for the project WORKDIR / @@ -31,7 +31,7 @@ WORKDIR /Services/Identity/src/Identity.Api # and no build, as we did it already RUN dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Identity/dev.Dockerfile b/src/Services/Identity/dev.Dockerfile index 624a7ce5..dbcde4f9 100644 --- a/src/Services/Identity/dev.Dockerfile +++ b/src/Services/Identity/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder # Setup working directory for the project WORKDIR / @@ -34,7 +34,7 @@ WORKDIR /Services/Identity/src/Identity.Api RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \ dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Passenger/Dockerfile b/src/Services/Passenger/Dockerfile index 8ff7507f..922bda4f 100644 --- a/src/Services/Passenger/Dockerfile +++ b/src/Services/Passenger/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -31,7 +31,7 @@ WORKDIR /Services/Passenger/src/Passenger.Api # and no build, as we did it already RUN dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR / diff --git a/src/Services/Passenger/dev.Dockerfile b/src/Services/Passenger/dev.Dockerfile index 34d01496..9582ce53 100644 --- a/src/Services/Passenger/dev.Dockerfile +++ b/src/Services/Passenger/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder WORKDIR / COPY ./.editorconfig ./ @@ -34,7 +34,7 @@ WORKDIR /Services/Passenger/src/Passenger.Api RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \ dotnet publish -c Release --no-build -o out -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 # Setup working directory for the project WORKDIR /