From 8f9e20163772b2423cd60822f0a07bb5b359bec8 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 20 Jul 2025 04:46:23 +0800
Subject: [PATCH] :bug: Trying to fix the Pass project

---
 DysonNetwork.Pass/Dockerfile | 49 ++++++++++--------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/DysonNetwork.Pass/Dockerfile b/DysonNetwork.Pass/Dockerfile
index d925d0e..a10c726 100644
--- a/DysonNetwork.Pass/Dockerfile
+++ b/DysonNetwork.Pass/Dockerfile
@@ -1,56 +1,33 @@
-# Stage 1: Base runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-# Stage 2: Build SPA
-FROM node:22-alpine AS spa-builder
-WORKDIR /src
-
-# 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
-
-# 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 SPA files
+COPY ["DysonNetwork.Pass/Client/package.json", "DysonNetwork.Pass/Client/package-lock.json*", "DysonNetwork.Pass/Client/"]
+WORKDIR /src/DysonNetwork.Pass/Client
+RUN npm install
+COPY ["DysonNetwork.Pass/Client/", "./"]
+RUN npm run build
+
+# Build .NET app
+WORKDIR /src
 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 \
-    -p:TypeScriptCompileBlocked=true \
-    -p:UseRazorBuildServer=false
+RUN dotnet build "DysonNetwork.Pass.csproj" -c Release -o /app/build
 
-# 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 Release -o /app/publish \
-    -p:TypeScriptCompileBlocked=true \
-    -p:UseRazorBuildServer=false \
-    /p:UseAppHost=false
+RUN dotnet publish "DysonNetwork.Pass.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
-# Final stage: Runtime
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .