mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-11-30 22:45:46 +01:00
Merge branch 'staging' of https://github.com/donpat1to/Schichtenplaner into staging
This commit is contained in:
18
Dockerfile
18
Dockerfile
@@ -17,13 +17,13 @@ COPY backend/tsconfig.json ./
|
|||||||
# Install backend dependencies
|
# Install backend dependencies
|
||||||
RUN npm ci
|
RUN npm ci
|
||||||
|
|
||||||
# Copy backend source
|
# Copy backend source and database files
|
||||||
COPY backend/src/ ./src/
|
COPY backend/src/ ./src/
|
||||||
|
COPY backend/database/ ./database/
|
||||||
|
|
||||||
# Build backend
|
# Build backend
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
|
|
||||||
# Verify Python and OR-Tools installation
|
# Verify Python and OR-Tools installation
|
||||||
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
|
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
|
||||||
|
|
||||||
@@ -47,16 +47,10 @@ COPY frontend/public/ ./public/
|
|||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Production stage
|
# Production stage
|
||||||
FROM node:20-alpine
|
FROM node:20-bullseye
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install Python and OR-Tools for production
|
|
||||||
#RUN apk add --no-cache \
|
|
||||||
# python \
|
|
||||||
# py3-pip \
|
|
||||||
# && pip3 install ortools
|
|
||||||
|
|
||||||
# Install PM2 for process management
|
# Install PM2 for process management
|
||||||
RUN npm install -g pm2
|
RUN npm install -g pm2
|
||||||
|
|
||||||
@@ -64,7 +58,7 @@ RUN npm install -g pm2
|
|||||||
COPY --from=backend-builder /app/backend/package*.json ./
|
COPY --from=backend-builder /app/backend/package*.json ./
|
||||||
COPY --from=backend-builder /app/backend/dist/ ./dist/
|
COPY --from=backend-builder /app/backend/dist/ ./dist/
|
||||||
COPY --from=backend-builder /app/backend/node_modules/ ./node_modules/
|
COPY --from=backend-builder /app/backend/node_modules/ ./node_modules/
|
||||||
# COPY --from=backend-builder /app/backend/python-scripts/ ./python-scripts/
|
COPY --from=backend-builder /app/backend/database/ ./dist/database/
|
||||||
|
|
||||||
# Copy frontend built files
|
# Copy frontend built files
|
||||||
COPY --from=frontend-builder /app/frontend/build/ ./frontend-build/
|
COPY --from=frontend-builder /app/frontend/build/ ./frontend-build/
|
||||||
@@ -79,10 +73,6 @@ RUN addgroup -g 1001 -S nodejs && \
|
|||||||
|
|
||||||
USER schichtplan
|
USER schichtplan
|
||||||
|
|
||||||
# Verify installations
|
|
||||||
#RUN python --version && \
|
|
||||||
# python -c "from ortools.sat.python import cp_model; print('OR-Tools verified')"
|
|
||||||
|
|
||||||
EXPOSE 3000 3002
|
EXPOSE 3000 3002
|
||||||
|
|
||||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
|
||||||
|
|||||||
Reference in New Issue
Block a user