Compare commits
2 Commits
60c24d0d8c
...
ce4a74ad57
| Author | SHA1 | Date | |
|---|---|---|---|
| ce4a74ad57 | |||
| af573a8aff |
@@ -1,11 +1,12 @@
|
|||||||
# -- Stage 1: Build Vite frontend ---------------------------------------------
|
# -- Stage 1: Build Vite frontend ---------------------------------------------
|
||||||
|
# Build context is ClarityStack/ root so Directory.*.props are available.
|
||||||
FROM node:22-alpine AS frontend
|
FROM node:22-alpine AS frontend
|
||||||
WORKDIR /frontend
|
WORKDIR /frontend
|
||||||
|
|
||||||
COPY frontend/package.json frontend/package-lock.json* ./
|
COPY Clarity/frontend/package.json Clarity/frontend/package-lock.json* ./
|
||||||
RUN npm ci --legacy-peer-deps
|
RUN npm ci --legacy-peer-deps
|
||||||
|
|
||||||
COPY frontend/ ./
|
COPY Clarity/frontend/ ./
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
# Output lands in /frontend/dist
|
# Output lands in /frontend/dist
|
||||||
|
|
||||||
@@ -13,13 +14,17 @@ RUN npm run build
|
|||||||
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
COPY ["Clarity.Server/Clarity.Server.csproj", "Clarity.Server/"]
|
# Copy central package/build props first (at ClarityStack/ root)
|
||||||
COPY ["Clarity.ServiceDefaults/Clarity.ServiceDefaults.csproj", "Clarity.ServiceDefaults/"]
|
COPY Directory.Packages.props ./
|
||||||
COPY ["Directory.Packages.props", "./"]
|
COPY Directory.Build.props ./
|
||||||
|
|
||||||
|
COPY ["Clarity/Clarity.Server/Clarity.Server.csproj", "Clarity.Server/"]
|
||||||
|
COPY ["Clarity/Clarity.ServiceDefaults/Clarity.ServiceDefaults.csproj", "Clarity.ServiceDefaults/"]
|
||||||
|
|
||||||
RUN dotnet restore "Clarity.Server/Clarity.Server.csproj"
|
RUN dotnet restore "Clarity.Server/Clarity.Server.csproj"
|
||||||
|
|
||||||
COPY . .
|
# Copy only the Clarity/ subtree so OPC/, gateway/ etc. are excluded
|
||||||
|
COPY Clarity/ .
|
||||||
|
|
||||||
# Embed the Vite build into wwwroot (mirrors Aspire PublishWithContainerFiles)
|
# Embed the Vite build into wwwroot (mirrors Aspire PublishWithContainerFiles)
|
||||||
COPY --from=frontend /frontend/dist ./Clarity.Server/wwwroot/
|
COPY --from=frontend /frontend/dist ./Clarity.Server/wwwroot/
|
||||||
|
|||||||
Reference in New Issue
Block a user