🐛 Speechless
This commit is contained in:
@@ -1,30 +1,56 @@
|
|||||||
|
# Stage 1: Base runtime image
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
|
||||||
USER $APP_UID
|
USER $APP_UID
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
EXPOSE 8081
|
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
|
WORKDIR /src
|
||||||
COPY . .
|
|
||||||
RUN dotnet restore "DysonNetwork.Pass/DysonNetwork.Pass.csproj"
|
|
||||||
|
|
||||||
# Copy SPA files
|
# Copy package files for SPA
|
||||||
WORKDIR /src/DysonNetwork.Pass/Client
|
COPY ["DysonNetwork.Pass/Client/package.json", "DysonNetwork.Pass/Client/package-lock.json*", "./Client/"]
|
||||||
|
|
||||||
|
# Install SPA dependencies
|
||||||
|
WORKDIR /src/Client
|
||||||
RUN npm install
|
RUN npm install
|
||||||
|
|
||||||
|
# Copy SPA source
|
||||||
|
COPY ["DysonNetwork.Pass/Client/", "./"]
|
||||||
|
|
||||||
|
# Build SPA
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Build .NET app
|
# Stage 3: Build .NET application
|
||||||
|
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
||||||
WORKDIR /src
|
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"
|
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
|
FROM build AS publish
|
||||||
ARG BUILD_CONFIGURATION=Release
|
|
||||||
# Ensure the target directory for localized resources exists
|
|
||||||
RUN mkdir -p /app/publish/zh-Hans
|
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
|
FROM base AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=publish /app/publish .
|
COPY --from=publish /app/publish .
|
||||||
|
@@ -7,10 +7,26 @@ EXPOSE 8081
|
|||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
||||||
ARG BUILD_CONFIGURATION=Release
|
ARG BUILD_CONFIGURATION=Release
|
||||||
WORKDIR /src
|
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"
|
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"
|
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
|
FROM build AS publish
|
||||||
ARG BUILD_CONFIGURATION=Release
|
ARG BUILD_CONFIGURATION=Release
|
||||||
|
Reference in New Issue
Block a user