Compare commits

...

6 Commits

4 changed files with 39 additions and 938 deletions

View File

@@ -78,9 +78,7 @@ jobs:
- name: Install backend dependencies - name: Install backend dependencies
working-directory: ./backend working-directory: ./backend
run: | run: npm install
# Try npm ci first, if it fails use npm install
npm ci || (echo "package-lock.json out of sync, using npm install..." && npm install)
- name: Run TypeScript check - name: Run TypeScript check
working-directory: ./backend working-directory: ./backend

View File

@@ -10,13 +10,23 @@ RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
# Create symlink so python3 is callable as python # Create symlink so python3 is callable as python
RUN ln -sf /usr/bin/python3 /usr/bin/python RUN ln -sf /usr/bin/python3 /usr/bin/python
# Copy all files # Copy root package files first
COPY . . COPY package*.json ./
COPY tsconfig.base.json ./
COPY ecosystem.config.cjs ./
# Install all dependencies (workspaces) # Install root dependencies
RUN npm ci RUN npm install
# Build backend # Copy workspace files
COPY backend/ ./backend/
COPY frontend/ ./frontend/
# Install workspace dependencies individually
RUN npm install --workspace=backend
RUN npm install --workspace=frontend
# Build backend first
RUN npm run build --workspace=backend RUN npm run build --workspace=backend
# Build frontend # Build frontend
@@ -25,45 +35,26 @@ RUN npm run build --workspace=frontend
# 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')"
# Production stage # Production stage (same as above)
FROM node:20-bookworm FROM node:20-bookworm
WORKDIR /app WORKDIR /app
# Install PM2 for process management
RUN npm install -g pm2 RUN npm install -g pm2
# Create data directory for SQLite database with proper permissions
RUN mkdir -p /app/data RUN mkdir -p /app/data
# Copy backend built files
COPY --from=builder /app/backend/dist/ ./dist/ COPY --from=builder /app/backend/dist/ ./dist/
COPY --from=builder /app/backend/package*.json ./ COPY --from=builder /app/backend/package*.json ./
# Copy only production dependencies
COPY --from=builder /app/node_modules/ ./node_modules/ COPY --from=builder /app/node_modules/ ./node_modules/
# Copy frontend built files
COPY --from=builder /app/frontend/dist/ ./frontend-build/ COPY --from=builder /app/frontend/dist/ ./frontend-build/
# Copy PM2 configuration
COPY --from=builder /app/ecosystem.config.cjs ./ COPY --from=builder /app/ecosystem.config.cjs ./
COPY --from=builder /app/backend/src/database/ ./dist/database/
# Create a non-root user and group - DEBIAN STYLE COPY --from=builder /app/backend/src/database/ ./database/
RUN groupadd -g 1001 nodejs && \ RUN groupadd -g 1001 nodejs && \
useradd -m -u 1001 -s /bin/bash -g nodejs schichtplan && \ useradd -m -u 1001 -s /bin/bash -g nodejs schichtplan && \
chown -R schichtplan:nodejs /app && \ chown -R schichtplan:nodejs /app && \
chmod 755 /app && \ chmod 755 /app && \
chmod 775 /app/data chmod 775 /app/data
# Set PM2 to use app directory instead of home directory
ENV PM2_HOME=/app/.pm2 ENV PM2_HOME=/app/.pm2
USER schichtplan USER schichtplan
EXPOSE 3002 EXPOSE 3002
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \ HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
CMD wget --no-verbose --tries=1 --spider http://localhost:3002/api/health || exit 1 CMD wget --no-verbose --tries=1 --spider http://localhost:3002/api/health || exit 1
CMD ["pm2-runtime", "ecosystem.config.cjs"] CMD ["pm2-runtime", "ecosystem.config.cjs"]

View File

@@ -9,6 +9,7 @@
"react-router-dom": "^6.28.0" "react-router-dom": "^6.28.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "20.19.23",
"@types/react": "^19.0.0", "@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0", "@types/react-dom": "^19.0.0",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",

927
package-lock.json generated

File diff suppressed because it is too large Load Diff