From 9fbe2ab77aebafb1a8c539cd54b22be17f5ba963 Mon Sep 17 00:00:00 2001 From: Maxence Lanone Date: Mon, 13 Mar 2023 09:35:37 +0100 Subject: [PATCH] :construction: add new Dockerfile --- .dockerignore => Sources/.dockerignore | 48 +++++++++---------- Sources/LeagueOfLegends.sln | 11 +++-- Sources/WebApiLol/Dockerfile | 25 ++++++++++ .../docker-compose.dcproj | 8 +++- .../docker-compose.override.yml | 0 .../docker-compose.yml | 0 6 files changed, 62 insertions(+), 30 deletions(-) rename .dockerignore => Sources/.dockerignore (85%) create mode 100644 Sources/WebApiLol/Dockerfile rename docker-compose.dcproj => Sources/docker-compose.dcproj (53%) rename docker-compose.override.yml => Sources/docker-compose.override.yml (100%) rename docker-compose.yml => Sources/docker-compose.yml (100%) diff --git a/.dockerignore b/Sources/.dockerignore similarity index 85% rename from .dockerignore rename to Sources/.dockerignore index e000d6d..bdca33b 100644 --- a/.dockerignore +++ b/Sources/.dockerignore @@ -1,25 +1,25 @@ -**/.classpath -**/.dockerignore -**/.env -**/.git -**/.gitignore -**/.project -**/.settings -**/.toolstarget -**/.vs -**/.vscode -**/*.*proj.user -**/*.dbmdl -**/*.jfm -**/azds.yaml -**/Dockerfile -**/bin -**/charts -**/docker-compose* -**/node_modules -**/npm-debug.log -**/obj -**/secrets.dev.yaml -**/values.dev.yaml -LICENSE +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE README.md \ No newline at end of file diff --git a/Sources/LeagueOfLegends.sln b/Sources/LeagueOfLegends.sln index 4ddf591..d8877d5 100644 --- a/Sources/LeagueOfLegends.sln +++ b/Sources/LeagueOfLegends.sln @@ -26,11 +26,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiLol", "WebApiLol\WebApiLol.csproj", "{DAE3B5A2-8904-43AE-8459-ED64C3366FDF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73142960-0D40-4766-973B-37094F4BD879}" - ProjectSection(SolutionItems) = preProject - Dockerfile = Dockerfile - EndProjectSection EndProject -Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "ConsoleTestapi", "Tests\ConsoleTestapi\ConsoleTestapi.csproj", "{EA884D64-6425-46FB-BA25-E2EB8FE6BECE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTestapi", "Tests\ConsoleTestapi\ConsoleTestapi.csproj", "{EA884D64-6425-46FB-BA25-E2EB8FE6BECE}" +EndProject +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{1B81A541-7D10-4603-B5A2-94108954D831}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -78,6 +77,10 @@ Global {EA884D64-6425-46FB-BA25-E2EB8FE6BECE}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA884D64-6425-46FB-BA25-E2EB8FE6BECE}.Release|Any CPU.ActiveCfg = Release|Any CPU {EA884D64-6425-46FB-BA25-E2EB8FE6BECE}.Release|Any CPU.Build.0 = Release|Any CPU + {1B81A541-7D10-4603-B5A2-94108954D831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1B81A541-7D10-4603-B5A2-94108954D831}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1B81A541-7D10-4603-B5A2-94108954D831}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1B81A541-7D10-4603-B5A2-94108954D831}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Sources/WebApiLol/Dockerfile b/Sources/WebApiLol/Dockerfile new file mode 100644 index 0000000..ad383f4 --- /dev/null +++ b/Sources/WebApiLol/Dockerfile @@ -0,0 +1,25 @@ +#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:7.0 AS base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +WORKDIR /src +COPY ["WebApiLol/WebApiLol.csproj", "WebApiLol/"] +COPY ["Model/Model.csproj", "Model/"] +COPY ["Shared/Shared.csproj", "Shared/"] +COPY ["StubLib/StubLib.csproj", "StubLib/"] +RUN dotnet restore "WebApiLol/WebApiLol.csproj" +COPY . . +WORKDIR "/src/WebApiLol" +RUN dotnet build "WebApiLol.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "WebApiLol.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "WebApiLol.dll"] diff --git a/docker-compose.dcproj b/Sources/docker-compose.dcproj similarity index 53% rename from docker-compose.dcproj rename to Sources/docker-compose.dcproj index 7b6f00e..a65784f 100644 --- a/docker-compose.dcproj +++ b/Sources/docker-compose.dcproj @@ -1,14 +1,18 @@ - + 2.1 Linux + {1B81A541-7D10-4603-B5A2-94108954D831} + True + {Scheme}://localhost:{ServicePort}/swagger + webapilol docker-compose.yml - + diff --git a/docker-compose.override.yml b/Sources/docker-compose.override.yml similarity index 100% rename from docker-compose.override.yml rename to Sources/docker-compose.override.yml diff --git a/docker-compose.yml b/Sources/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to Sources/docker-compose.yml