From e6fd35c4a21034292d07dfc0bcb502f5abfa6e31 Mon Sep 17 00:00:00 2001
From: Kevin Hahn <hahn.kev@gmail.com>
Date: Wed, 27 Sep 2023 10:02:56 +0700
Subject: [PATCH] update dockerfiles, use recommended build props for running
 in containers

---
 backend/Directory.Build.props    | 13 +++++++++----
 backend/Dockerfile               |  4 ++--
 backend/LexBoxApi/dev.Dockerfile |  3 +--
 backend/LexData/LexData.csproj   |  1 -
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/Directory.Build.props b/backend/Directory.Build.props
index 6c5a1264e0..0c608b4864 100644
--- a/backend/Directory.Build.props
+++ b/backend/Directory.Build.props
@@ -1,12 +1,17 @@
 <Project>
-    <PropertyGroup Condition="$(DockerDev) == 'true'">
-        <IntermediateOutputPath>/app/obj/</IntermediateOutputPath>
-        <OutputPath>/app/bin/</OutputPath>
+    <PropertyGroup>
+        <DefaultItemExcludes>$(DefaultItemExcludes);$(MSBuildProjectDirectory)/obj/**/*</DefaultItemExcludes>
+        <DefaultItemExcludes>$(DefaultItemExcludes);$(MSBuildProjectDirectory)/bin/**/*</DefaultItemExcludes>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(DOTNET_RUNNING_IN_CONTAINER)' == 'true'">
+        <BaseIntermediateOutputPath>$(MSBuildProjectDirectory)/obj/container/</BaseIntermediateOutputPath>
+        <BaseOutputPath>$(MSBuildProjectDirectory)/bin/container/</BaseOutputPath>
     </PropertyGroup>
     <PropertyGroup>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40" PrivateAssets="all"/>
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 3bff244cb4..5db510894c 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 COPY . .
 # WORKDIR /src
diff --git a/backend/LexBoxApi/dev.Dockerfile b/backend/LexBoxApi/dev.Dockerfile
index bb4c4a7b5a..b1fc1f05f1 100644
--- a/backend/LexBoxApi/dev.Dockerfile
+++ b/backend/LexBoxApi/dev.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 EXPOSE 80
 EXPOSE 443
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
@@ -14,5 +14,4 @@ RUN for file in $(ls *.csproj); do dir=${file%.*} mkdir -p ${file%.*}/ && mv $fi
 COPY . .
 WORKDIR /src/backend/LexBoxApi
 RUN mkdir /src/frontend
-ENV DockerDev=true
 CMD dotnet watch run -lp docker --property:InformationalVersion=dockerDev
diff --git a/backend/LexData/LexData.csproj b/backend/LexData/LexData.csproj
index 6f3e4da91b..6a8b91e451 100644
--- a/backend/LexData/LexData.csproj
+++ b/backend/LexData/LexData.csproj
@@ -21,7 +21,6 @@
       <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-rc.1.23419.4" />
       <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
       <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
-      <PackageReference Update="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30" />
 </ItemGroup>
 
     <ItemGroup>