Compare commits

..

8 Commits

2 changed files with 8 additions and 18 deletions

View File

@@ -3,9 +3,8 @@ name: CI/CD Pipeline
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ main, master, development ] branches: [ "development", "main", "staging" ]
pull_request: tags: [ "v*.*.*" ]
branches: [ main, master, development ]
env: env:
REGISTRY: ghcr.io REGISTRY: ghcr.io
@@ -165,7 +164,7 @@ jobs:
- name: Display pushed images - name: Display pushed images
run: | run: |
echo "Docker images pushed successfully!" echo "Docker images pushed successfully!"
echo "📦 Image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" echo "- Image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
echo "🏷️ Tags: ${{ steps.meta.outputs.tags }}" echo "- Tags: ${{ steps.meta.outputs.tags }}"
echo "🚀 New version: ${{ needs.set-tag.outputs.tag_name }}" echo "- New version: ${{ needs.set-tag.outputs.tag_name }}"

View File

@@ -23,6 +23,8 @@ COPY backend/src/ ./src/
# Build backend # Build backend
RUN npm run build RUN npm run build
# Copy database files manually
RUN cp -r src/database/ dist/database/
# 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')"
@@ -51,12 +53,6 @@ FROM node:20-alpine
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 +60,6 @@ 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 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 +74,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 \