Merge branch 'develop' of https://github.com/sensenet/sn-taskmanagement…

… into develop
SenseNet · Feb 10, 2025 · a4d2e2a · a4d2e2a
2 parents 1b4998c + fb8e7df
commit a4d2e2a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/SenseNetTaskAgent/Dockerfile b/src/SenseNetTaskAgent/Dockerfile
@@ -1,11 +1,11 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
-RUN dotnet restore "TaskManagement.sln" 
 WORKDIR "/src/SenseNetTaskAgent"
+RUN dotnet restore "SenseNetTaskAgent.csproj" 
 RUN dotnet build "SenseNetTaskAgent.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/src/TaskManagementWeb.SNaaS/Dockerfile b/src/TaskManagementWeb.SNaaS/Dockerfile
@@ -1,13 +1,13 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.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:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
-RUN dotnet restore "TaskManagement.sln" 
 WORKDIR "/src/TaskManagementWeb.SNaaS"
+RUN dotnet restore "TaskManagement.Web.SNaaS.csproj"
 RUN dotnet build "TaskManagement.Web.SNaaS.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/src/TaskManagementWeb/Dockerfile b/src/TaskManagementWeb/Dockerfile
@@ -1,13 +1,13 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.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:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
-RUN dotnet restore "TaskManagement.sln" 
 WORKDIR "/src/TaskManagementWeb"
+RUN dotnet restore "TaskManagement.Web.csproj" 
 RUN dotnet build "TaskManagement.Web.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/src/TestExecutor/Dockerfile b/src/TestExecutor/Dockerfile
@@ -2,11 +2,11 @@ ARG TASKAGENT_VERSION=latest
 FROM sensenetcsp/sn-taskagent:${TASKAGENT_VERSION} AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
-RUN dotnet restore "TestExecutor/TestExecutor.csproj"
 WORKDIR "/src/TestExecutor"
+RUN dotnet restore "TestExecutor.csproj"
 RUN dotnet build "TestExecutor.csproj" -c Release -o /app/build
 
 FROM build AS publish