Merge pull request #2911 from bluewave-labs/develop

develop->master
This commit is contained in:
Alexander Holliday authored and GitHub committed 2025-09-01 09:23:01 -07:00
commit f5e633a781
3 files changed
+7 -5

No files matched your search

+3
View File
@@ -62,5 +62,8 @@
},
"optionalDependencies": {
"@rollup/rollup-linux-arm64-musl": "4.41.0"
},
"overrides": {
"rollup": "^3.29.4"
}
}
+3 -4
View File
@@ -2,19 +2,18 @@ FROM node:20-slim AS frontend-build
WORKDIR /app/client
COPY client/package*.json ./
RUN npm ci --omit=optional
COPY client/package.json ./
RUN npm ci
COPY client ./
RUN npm run build
FROM node:20-slim AS backend
WORKDIR /app/server
COPY server/package*.json ./
RUN npm ci --omit=optional
RUN npm ci
COPY server ./
COPY --from=frontend-build /app/client/dist ./public
+1 -1
View File
@@ -2,7 +2,7 @@ FROM node:20-slim AS frontend-build
WORKDIR /app/client
COPY client/package*.json ./
COPY client/package.json ./
RUN npm install
COPY client ./