diff --git a/backend/Directory.Build.props b/backend/Directory.Build.props index 6c5a1264e..0c608b486 100644 --- a/backend/Directory.Build.props +++ b/backend/Directory.Build.props @@ -1,12 +1,17 @@ - - /app/obj/ - /app/bin/ + + $(DefaultItemExcludes);$(MSBuildProjectDirectory)/obj/**/* + $(DefaultItemExcludes);$(MSBuildProjectDirectory)/bin/**/* + + + + $(MSBuildProjectDirectory)/obj/container/ + $(MSBuildProjectDirectory)/bin/container/ false - + diff --git a/backend/Dockerfile b/backend/Dockerfile index 3bff244cb..5db510894 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 bb4c4a7b5..b1fc1f05f 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 6f3e4da91..6a8b91e45 100644 --- a/backend/LexData/LexData.csproj +++ b/backend/LexData/LexData.csproj @@ -21,7 +21,6 @@ -