Compare commits

...

10 Commits

3 changed files with 15 additions and 29 deletions

View File

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

View File

@@ -23,13 +23,9 @@ COPY backend/src/ ./src/
# Build backend
RUN npm run build
# Verify Python and OR-Tools installation
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
#RUN python3 -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
# Frontend build stage
FROM node:20-bullseye AS frontend-builder
@@ -54,12 +50,6 @@ FROM node:20-alpine
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
RUN npm install -g pm2
@@ -67,13 +57,12 @@ RUN npm install -g pm2
COPY --from=backend-builder /app/backend/package*.json ./
COPY --from=backend-builder /app/backend/dist/ ./dist/
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 --from=frontend-builder /app/frontend/build/ ./frontend-build/
# Copy PM2 configuration
COPY ecosystem.config.js ./
COPY ecosystem.config.cjs ./
# Create a non-root user
RUN addgroup -g 1001 -S nodejs && \
@@ -82,13 +71,9 @@ RUN addgroup -g 1001 -S nodejs && \
USER schichtplan
# Verify installations
#RUN python --version && \
# python -c "from ortools.sat.python import cp_model; print('OR-Tools verified')"
EXPOSE 3000 3002
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 ["pm2-runtime", "ecosystem.config.js"]
CMD ["pm2-runtime", "ecosystem.config.cjs"]

View File

@@ -1,3 +1,4 @@
// ecosystem.config.cjs
module.exports = {
apps: [
{