mirror of
https://github.com/9technologygroup/patchmon.net.git
synced 2025-10-26 01:23:35 +00:00
fix: Revert Dockerfile edits and lockfile changes
This reverts commits8409b71857and78eb2b183e
This commit is contained in:
@@ -4,19 +4,13 @@ RUN apk add --no-cache openssl
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Copy backend package files
|
||||
COPY --chown=node:node backend/package*.json /app/backend/
|
||||
COPY --chown=node:node package*.json /app/
|
||||
COPY --chown=node:node backend/ /app/backend/
|
||||
|
||||
WORKDIR /app/backend
|
||||
|
||||
# Install backend dependencies (now has its own package-lock.json)
|
||||
RUN npm ci --ignore-scripts
|
||||
|
||||
# Copy backend source after dependencies are installed
|
||||
COPY --chown=node:node backend/ /app/backend/
|
||||
|
||||
# Generate Prisma client and clean up
|
||||
RUN npx prisma generate &&\
|
||||
RUN npm ci --ignore-scripts &&\
|
||||
npx prisma generate &&\
|
||||
npm prune --omit=dev &&\
|
||||
npm cache clean --force
|
||||
|
||||
@@ -35,6 +29,7 @@ USER node
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=builder /app/backend /app/backend
|
||||
COPY --from=builder /app/node_modules /app/node_modules
|
||||
COPY --chown=node:node agents ./agents_backup
|
||||
COPY --chown=node:node agents ./agents
|
||||
COPY --chmod=755 docker/backend.docker-entrypoint.sh ./entrypoint.sh
|
||||
|
||||
@@ -2,19 +2,14 @@ FROM node:lts-alpine AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Copy frontend package files
|
||||
COPY package*.json ./
|
||||
COPY frontend/package*.json ./frontend/
|
||||
|
||||
WORKDIR /app/frontend
|
||||
|
||||
# Install frontend dependencies (now has its own package-lock.json)
|
||||
RUN npm ci --ignore-scripts
|
||||
|
||||
# Copy frontend source after dependencies are installed
|
||||
COPY frontend/ ./
|
||||
COPY frontend/ ./frontend/
|
||||
|
||||
# Build the frontend
|
||||
RUN npm run build
|
||||
RUN npm run build:frontend
|
||||
|
||||
FROM nginxinc/nginx-unprivileged:alpine
|
||||
|
||||
|
||||
Reference in New Issue
Block a user