Merge branch 'master' into update-packages

ppy · Apr 15, 2024 · 1af3e97 · 1af3e97
2 parents 15a19b2 + 2f68d48
commit 1af3e97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/osu.Server.DifficultyCalculator/Dockerfile b/osu.Server.DifficultyCalculator/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Handle project files and dependencies first for caching benefits
@@ -16,7 +16,7 @@ RUN dotnet publish -c Release -o out
 RUN rm -rf ./out/runtimes ./out/osu.Game.Resources.dll
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 WORKDIR /app
 COPY --from=build-env /app/osu.Server.DifficultyCalculator/out .
 ENTRYPOINT ["dotnet", "osu.Server.DifficultyCalculator.dll"]
diff --git a/osu.Server.Queues.BeatmapProcessor/Dockerfile b/osu.Server.Queues.BeatmapProcessor/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Handle project files and dependencies first for caching benefits
@@ -16,7 +16,7 @@ RUN dotnet publish -c Release -o out
 RUN rm -rf ./out/runtimes ./out/osu.Game.Resources.dll
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 WORKDIR /app
 COPY --from=build-env /app/osu.Server.Queues.BeatmapProcessor/out .
 ENTRYPOINT ["dotnet", "osu.Server.Queues.BeatmapProcessor.dll"]