mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-11-30 22:45:46 +01:00
Compare commits
8 Commits
v1.0.15
...
7c63bee1b3
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c63bee1b3 | |||
| 4c275993e6 | |||
| 5c925e3b54 | |||
| 11b6ee7672 | |||
| 19357d12c1 | |||
| 8ccd506b7d | |||
| e09979aa77 | |||
| 0eda1ac125 |
4
.github/workflows/docker.yml
vendored
4
.github/workflows/docker.yml
vendored
@@ -83,6 +83,10 @@ jobs:
|
||||
with:
|
||||
node-version: '20'
|
||||
|
||||
- name: Create package-lock.json
|
||||
working-directory: .
|
||||
run: npm i --package-lock-only
|
||||
|
||||
- name: Install backend dependencies
|
||||
working-directory: ./backend
|
||||
run: npm ci
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -57,6 +57,7 @@ yarn-error.log*
|
||||
# Build outputs
|
||||
dist/
|
||||
build/
|
||||
package-lock.json
|
||||
|
||||
# Environment variables
|
||||
.env
|
||||
|
||||
27
Dockerfile
27
Dockerfile
@@ -1,15 +1,8 @@
|
||||
# Single stage build for workspaces
|
||||
FROM node:20-bullseye AS builder
|
||||
FROM node:20-bookworm AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install Python + OR-Tools
|
||||
RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
|
||||
&& pip install --no-cache-dir ortools
|
||||
|
||||
# Create symlink so python3 is callable as python
|
||||
RUN ln -sf /usr/bin/python3 /usr/bin/python
|
||||
|
||||
# Copy root package files first
|
||||
COPY package*.json ./
|
||||
COPY tsconfig.base.json ./
|
||||
@@ -34,9 +27,6 @@ RUN npm run build --only=production --workspace=backend
|
||||
# Build frontend
|
||||
RUN npm run build --only=production --workspace=frontend
|
||||
|
||||
# Verify Python and OR-Tools installation
|
||||
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
|
||||
|
||||
# Production stage
|
||||
FROM node:20-bookworm
|
||||
|
||||
@@ -59,7 +49,20 @@ COPY --from=builder /app/frontend/dist/ ./frontend-build/
|
||||
COPY --from=builder /app/ecosystem.config.cjs ./
|
||||
|
||||
COPY --from=builder /app/backend/src/database/ ./dist/database/
|
||||
COPY --from=builder /app/backend/src/database/ ./database/
|
||||
# should be obsolete with the line above
|
||||
#COPY --from=builder /app/backend/src/database/ ./database/
|
||||
|
||||
COPY --from=builder /app/backend/src/python-scripts/ ./python-scripts/
|
||||
|
||||
# Install Python + OR-Tools
|
||||
RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
|
||||
&& pip install --no-cache-dir --break-system-packages ortools
|
||||
|
||||
# Create symlink so python3 is callable as python
|
||||
RUN ln -sf /usr/bin/python3 /usr/bin/python
|
||||
|
||||
# Verify Python and OR-Tools installation
|
||||
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
|
||||
|
||||
# Copy init script and env template
|
||||
COPY docker-init.sh /usr/local/bin/
|
||||
|
||||
6691
package-lock.json
generated
6691
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user