From 7261b1503803415d598e0025be33b82ecaf59cae Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 20 Jul 2025 12:49:58 +0800
Subject: [PATCH] :bug: Speechless

---
 DysonNetwork.Pass/Dockerfile   | 48 ++++++++++++++++++++++++++--------
 DysonNetwork.Sphere/Dockerfile | 20 ++++++++++++--
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/DysonNetwork.Pass/Dockerfile b/DysonNetwork.Pass/Dockerfile
index d45a080..a1f1503 100644
--- a/DysonNetwork.Pass/Dockerfile
+++ b/DysonNetwork.Pass/Dockerfile
@@ -1,31 +1,57 @@
+# Stage 1: Base runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+# Stage 2: Build SPA
+FROM node:22-alpine AS spa-builder
 WORKDIR /src
-COPY . .
-RUN dotnet restore "DysonNetwork.Pass/DysonNetwork.Pass.csproj"
 
-# Copy SPA files
-WORKDIR /src/DysonNetwork.Pass/Client
+# Copy package files for SPA
+COPY ["DysonNetwork.Pass/Client/package.json", "DysonNetwork.Pass/Client/package-lock.json*", "./Client/"]
+
+# Install SPA dependencies
+WORKDIR /src/Client
 RUN npm install
+
+# Copy SPA source
+COPY ["DysonNetwork.Pass/Client/", "./"]
+
+# Build SPA
 RUN npm run build
 
-# Build .NET app
+# Stage 3: Build .NET application
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 WORKDIR /src
+
+# Copy .csproj and restore as distinct layers
+COPY ["DysonNetwork.Pass/DysonNetwork.Pass.csproj", "DysonNetwork.Pass/"]
+RUN dotnet restore "DysonNetwork.Pass/DysonNetwork.Pass.csproj"
+
+# Copy everything else and build
+COPY . .
+
+# Copy built SPA to wwwroot
+COPY --from=spa-builder /src/Client/dist /src/DysonNetwork.Pass/wwwroot/dist
+
+# Build the application
 WORKDIR "/src/DysonNetwork.Pass"
-RUN dotnet build "DysonNetwork.Pass.csproj" -c Release -o /app/build
+RUN dotnet build "DysonNetwork.Pass.csproj" -c Release -o /app/build \
+    -p:TypeScriptCompileBlocked=true \
+    -p:UseRazorBuildServer=false
 
+# Stage 4: Publish
 FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-# Ensure the target directory for localized resources exists
 RUN mkdir -p /app/publish/zh-Hans
-RUN dotnet publish "DysonNetwork.Pass.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "DysonNetwork.Pass.csproj" -c Release -o /app/publish \
+    -p:TypeScriptCompileBlocked=true \
+    -p:UseRazorBuildServer=false \
+    /p:UseAppHost=false
 
+# Final stage: Runtime
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DysonNetwork.Pass.dll"]
+ENTRYPOINT ["dotnet", "DysonNetwork.Pass.dll"]
\ No newline at end of file
diff --git a/DysonNetwork.Sphere/Dockerfile b/DysonNetwork.Sphere/Dockerfile
index 10f05fc..c193a1c 100644
--- a/DysonNetwork.Sphere/Dockerfile
+++ b/DysonNetwork.Sphere/Dockerfile
@@ -7,10 +7,26 @@ EXPOSE 8081
 FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY . .
+
+# First copy only the solution and project files to restore packages
+COPY ["DysonNetwork.Sphere/DysonNetwork.Sphere.csproj", "DysonNetwork.Sphere/"]
+COPY ["DysonNetwork.Pass/DysonNetwork.Pass.csproj", "DysonNetwork.Pass/"]
+COPY ["DysonNetwork.Shared/DysonNetwork.Shared.csproj", "DysonNetwork.Shared/"]
+
+# Restore packages
 RUN dotnet restore "DysonNetwork.Sphere/DysonNetwork.Sphere.csproj"
+
+# Copy everything else
+COPY . .
+
+# Create necessary directories for localized resources
+RUN mkdir -p /src/DysonNetwork.Sphere/bin/Release/net9.0/zh-hans \
+    && mkdir -p /src/DysonNetwork.Pass/bin/Release/net9.0/zh-hans
+
 WORKDIR "/src/DysonNetwork.Sphere"
-RUN dotnet build "./DysonNetwork.Sphere.csproj" -c $BUILD_CONFIGURATION -o /app/build
+RUN dotnet build "DysonNetwork.Sphere.csproj" -c $BUILD_CONFIGURATION -o /app/build \
+    -p:SatelliteResourceLanguages=en-US\;zh-hans \
+    -p:GenerateSatelliteAssembliesForCore=true
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release