diff --git a/Tasky.sln b/Tasky.sln index 8cd42642..eb539b8e 100644 --- a/Tasky.sln +++ b/Tasky.sln @@ -39,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.Projects.HttpApi", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.DbMigrator", "shared\Tasky.DbMigrator\Tasky.DbMigrator.csproj", "{D6921133-0AFF-4473-A469-7F2226AB5C1F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.IdentityServer", "apps\Tasky.IdentityServer\Tasky.IdentityServer.csproj", "{308AD51B-C6FF-4729-84E1-9B34AB2B8C79}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.IdentityService.Application", "services\identity\src\Tasky.IdentityService.Application\Tasky.IdentityService.Application.csproj", "{FF4727FF-93BA-4689-83FA-99D59DE571CA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.IdentityService.Application.Contracts", "services\identity\src\Tasky.IdentityService.Application.Contracts\Tasky.IdentityService.Application.Contracts.csproj", "{B38A5710-2E78-4716-B06E-6CA1735D63AF}" @@ -150,10 +148,6 @@ Global {D6921133-0AFF-4473-A469-7F2226AB5C1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D6921133-0AFF-4473-A469-7F2226AB5C1F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D6921133-0AFF-4473-A469-7F2226AB5C1F}.Release|Any CPU.Build.0 = Release|Any CPU - {308AD51B-C6FF-4729-84E1-9B34AB2B8C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {308AD51B-C6FF-4729-84E1-9B34AB2B8C79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {308AD51B-C6FF-4729-84E1-9B34AB2B8C79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {308AD51B-C6FF-4729-84E1-9B34AB2B8C79}.Release|Any CPU.Build.0 = Release|Any CPU {FF4727FF-93BA-4689-83FA-99D59DE571CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FF4727FF-93BA-4689-83FA-99D59DE571CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF4727FF-93BA-4689-83FA-99D59DE571CA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -278,7 +272,6 @@ Global {8525C031-819E-4D4E-8374-30B5F48274AD} = {2851429B-E91C-4710-B415-10A6DB96EE73} {0D121C5F-22C8-4657-B43E-9C8B34A4C41E} = {2851429B-E91C-4710-B415-10A6DB96EE73} {D6921133-0AFF-4473-A469-7F2226AB5C1F} = {140ED621-3D93-4523-8B62-BE6850E04698} - {308AD51B-C6FF-4729-84E1-9B34AB2B8C79} = {79065DE8-D7FB-40A5-980B-A0841A208B38} {FF4727FF-93BA-4689-83FA-99D59DE571CA} = {80C4C128-1F05-4376-9E2D-855D11FEE650} {B38A5710-2E78-4716-B06E-6CA1735D63AF} = {80C4C128-1F05-4376-9E2D-855D11FEE650} {D6645377-25A1-4F6E-836B-F7188DE9B9B8} = {80C4C128-1F05-4376-9E2D-855D11FEE650} diff --git a/apps/Tasky.AuthServer/Dockerfile b/apps/Tasky.AuthServer/Dockerfile new file mode 100644 index 00000000..8ec8dc3b --- /dev/null +++ b/apps/Tasky.AuthServer/Dockerfile @@ -0,0 +1,36 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["services/administration/NuGet.Config", "services/administration/"] +COPY ["services/identity/NuGet.Config", "services/identity/"] +COPY ["services/saas/NuGet.Config", "services/saas/"] +COPY ["apps/Tasky.AuthServer/Tasky.AuthServer.csproj", "apps/Tasky.AuthServer/"] +COPY ["services/administration/src/Tasky.Administration.EntityFrameworkCore/Tasky.Administration.EntityFrameworkCore.csproj", "services/administration/src/Tasky.Administration.EntityFrameworkCore/"] +COPY ["services/administration/src/Tasky.Administration.Domain/Tasky.Administration.Domain.csproj", "services/administration/src/Tasky.Administration.Domain/"] +COPY ["services/administration/src/Tasky.Administration.Domain.Shared/Tasky.Administration.Domain.Shared.csproj", "services/administration/src/Tasky.Administration.Domain.Shared/"] +COPY ["services/identity/src/Tasky.IdentityService.EntityFrameworkCore/Tasky.IdentityService.EntityFrameworkCore.csproj", "services/identity/src/Tasky.IdentityService.EntityFrameworkCore/"] +COPY ["services/identity/src/Tasky.IdentityService.Domain/Tasky.IdentityService.Domain.csproj", "services/identity/src/Tasky.IdentityService.Domain/"] +COPY ["services/identity/src/Tasky.IdentityService.Domain.Shared/Tasky.IdentityService.Domain.Shared.csproj", "services/identity/src/Tasky.IdentityService.Domain.Shared/"] +COPY ["services/saas/src/Tasky.SaaS.EntityFrameworkCore/Tasky.SaaS.EntityFrameworkCore.csproj", "services/saas/src/Tasky.SaaS.EntityFrameworkCore/"] +COPY ["services/saas/src/Tasky.SaaS.Domain/Tasky.SaaS.Domain.csproj", "services/saas/src/Tasky.SaaS.Domain/"] +COPY ["services/saas/src/Tasky.SaaS.Domain.Shared/Tasky.SaaS.Domain.Shared.csproj", "services/saas/src/Tasky.SaaS.Domain.Shared/"] +COPY ["shared/Tasky.Microservice.Shared/Tasky.Microservice.Shared.csproj", "shared/Tasky.Microservice.Shared/"] +COPY ["shared/Tasky.Hosting.Shared/Tasky.Hosting.Shared.csproj", "shared/Tasky.Hosting.Shared/"] +RUN dotnet restore "apps/Tasky.AuthServer/Tasky.AuthServer.csproj" +COPY . . +WORKDIR "/src/apps/Tasky.AuthServer" +RUN dotnet build "Tasky.AuthServer.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "Tasky.AuthServer.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Tasky.AuthServer.dll"] \ No newline at end of file diff --git a/apps/Tasky.AuthServer/Properties/launchSettings.json b/apps/Tasky.AuthServer/Properties/launchSettings.json index 6c955f86..0e8d6667 100644 --- a/apps/Tasky.AuthServer/Properties/launchSettings.json +++ b/apps/Tasky.AuthServer/Properties/launchSettings.json @@ -1,12 +1,4 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "https://localhost:7600", - "sslPort": 7600 - } - }, "profiles": { "IIS Express": { "commandName": "IISExpress", @@ -18,10 +10,25 @@ "Tasky.AuthServer": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "https://localhost:7600", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "applicationUrl": "https://localhost:7600" + }, + "Docker": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", + "publishAllPorts": true, + "useSSL": true + } + }, + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "https://localhost:7600", + "sslPort": 7600 } } } \ No newline at end of file diff --git a/apps/Tasky.AuthServer/Tasky.AuthServer.csproj b/apps/Tasky.AuthServer/Tasky.AuthServer.csproj index 59c11725..f3b14ef1 100644 --- a/apps/Tasky.AuthServer/Tasky.AuthServer.csproj +++ b/apps/Tasky.AuthServer/Tasky.AuthServer.csproj @@ -10,6 +10,8 @@ false true Tasky-4681b4fd-151f-4221-84a4-929d86723e4c + Linux + ..\.. @@ -29,6 +31,7 @@ +