From 9a7ec9d6c32186735ac9d20f670e75f33fd14584 Mon Sep 17 00:00:00 2001
From: Antoine Jourdain <antoine.jourdain@etu.uca.fr>
Date: Wed, 17 Jan 2024 14:31:50 +0100
Subject: [PATCH 1/2] API work pls

---
 Project/adminBlazor/adminBlazor.Api/Dockerfile | 18 ++++++++++--------
 .../adminBlazor.Api/adminBlazor.Api.csproj     |  6 ++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Project/adminBlazor/adminBlazor.Api/Dockerfile b/Project/adminBlazor/adminBlazor.Api/Dockerfile
index 7690b94..80ac20b 100644
--- a/Project/adminBlazor/adminBlazor.Api/Dockerfile
+++ b/Project/adminBlazor/adminBlazor.Api/Dockerfile
@@ -1,20 +1,22 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+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
+ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["src/Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj", "Minecraft.Crafting.Api/"]
-RUN dotnet restore "Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj"
-COPY src/. .
-WORKDIR "/src/Minecraft.Crafting.Api"
-RUN dotnet build "Minecraft.Crafting.Api.csproj" -c Release -o /app/build
+COPY ["adminBlazor.Api/adminBlazor.Api.csproj", "adminBlazor.Api/"]
+RUN dotnet restore "adminBlazor.Api/adminBlazor.Api.csproj"
+COPY . .
+WORKDIR "/src/adminBlazor.Api"
+RUN dotnet build "adminBlazor.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "Minecraft.Crafting.Api.csproj" -c Release -o /app/publish /p:UseAppHost=false
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "adminBlazor.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Minecraft.Crafting.Api.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "adminBlazor.Api.dll"]
diff --git a/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj b/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj
index ef88842..585904b 100644
--- a/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj
+++ b/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Minecraft.Crafting.Api' " />
@@ -11,5 +12,10 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\.dockerignore">
+      <Link>.dockerignore</Link>
+    </Content>
+  </ItemGroup>
     
 </Project>

From 78c818318dd729b1322c3067054deeb2ab18124d Mon Sep 17 00:00:00 2001
From: Antoine Jourdain <antoine.jourdain@etu.uca.fr>
Date: Wed, 17 Jan 2024 14:45:06 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Passage=20API=20.net6=20=C3=A0=20.net7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Project/adminBlazor/.dockerignore             | 55 +++++++++----------
 .../adminBlazor/adminBlazor.Api/Dockerfile    |  4 +-
 .../adminBlazor.Api/adminBlazor.Api.csproj    |  2 +-
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/Project/adminBlazor/.dockerignore b/Project/adminBlazor/.dockerignore
index fe1152b..38bece4 100644
--- a/Project/adminBlazor/.dockerignore
+++ b/Project/adminBlazor/.dockerignore
@@ -1,30 +1,25 @@
-**/.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
-!**/.gitignore
-!.git/HEAD
-!.git/config
-!.git/packed-refs
-!.git/refs/heads/**
\ No newline at end of file
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*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/Project/adminBlazor/adminBlazor.Api/Dockerfile b/Project/adminBlazor/adminBlazor.Api/Dockerfile
index 80ac20b..1b16200 100644
--- a/Project/adminBlazor/adminBlazor.Api/Dockerfile
+++ b/Project/adminBlazor/adminBlazor.Api/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["adminBlazor.Api/adminBlazor.Api.csproj", "adminBlazor.Api/"]
diff --git a/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj b/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj
index 585904b..311d69b 100644
--- a/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj
+++ b/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>