01-ImproveUseOfStorage #4

Merged
husbando_enjoyer merged 4 commits from bugfix/main-01-ImproveUseOfStorage into main 2025-12-15 18:08:23 +01:00
2 changed files with 152 additions and 179 deletions

151
Jenkinsfile vendored
View File

@@ -8,8 +8,8 @@ pipeline {
environment { environment {
CI = 'true' CI = 'true'
NODE_OPTIONS = '--max_old_space_size=2048' NODE_OPTIONS = '--max_old_space_size=2048'
APP_VERSION = "1.0.${BUILD_NUMBER}" APP_VERSION = "1.0.${BUILD_NUMBER}"
DOCKER_BUILDKIT = '1'
} }
stages { stages {
@@ -28,41 +28,13 @@ pipeline {
returnStdout: true returnStdout: true
).trim() ).trim()
} }
echo "Last commit: ${env.COMMIT_AUTHOR}"
}
}
/* =========================
BACKEND (Python)
========================= */
stage('Backend: deps') {
agent {
docker {
image 'python:3.12'
args '-u root'
}
}
steps {
dir('backend') {
sh '''
set -e
python --version
python -m venv .venv
. .venv/bin/activate
pip install --upgrade pip
pip install -r requirements-dev.txt
'''
}
} }
} }
stage('Backend: lint & test') { stage('Backend: lint & test') {
agent { agent {
docker { docker {
image 'python:3.12' image 'python:3.11-slim'
args '-u root' args '-u root'
} }
} }
@@ -70,7 +42,10 @@ pipeline {
dir('backend') { dir('backend') {
sh ''' sh '''
set -e set -e
python -m venv .venv
. .venv/bin/activate . .venv/bin/activate
pip install --upgrade pip
pip install -r requirements-dev.txt
ruff check app tests ruff check app tests
pytest pytest
''' '''
@@ -78,110 +53,104 @@ pipeline {
} }
} }
/* ========================= stage('Frontend: check & build') {
FRONTEND (Node)
========================= */
stage('Frontend: deps') {
agent { agent {
docker { docker {
image 'node:20' image 'node:20-slim'
} }
} }
steps { steps {
dir('frontend') { dir('frontend') {
sh ''' sh '''
set -e set -e
node --version
npm --version
npm install --no-progress --no-audit --prefer-offline npm install --no-progress --no-audit --prefer-offline
'''
}
}
}
stage('Frontend: check & test') {
agent {
docker {
image 'node:20'
}
}
steps {
dir('frontend') {
sh '''
set -e
npm run check npm run check
'''
}
}
}
stage('Frontend: build') {
agent {
docker {
image 'node:20'
}
}
steps {
dir('frontend') {
sh '''
set -e
npm run build npm run build
''' '''
} }
} }
} }
/* =========================
DOCKER
========================= */
stage('Docker: build images') { stage('Docker: build images') {
when {
expression {
fileExists('backend/Dockerfile') &&
fileExists('frontend/Dockerfile')
}
}
agent any agent any
steps { steps {
sh ''' sh '''
set -e set -e
docker version
docker build \ docker build \
--build-arg APP_VERSION=${APP_VERSION} \ --build-arg APP_VERSION=${APP_VERSION} \
--build-arg GIT_COMMIT=${COMMIT_SHORT} \ --build-arg GIT_COMMIT=${COMMIT_SHORT} \
--build-arg COMMIT_AUTHOR="${COMMIT_AUTHOR}" \ --build-arg COMMIT_AUTHOR="${COMMIT_AUTHOR}" \
--build-arg BUILD_NUMBER=${BUILD_NUMBER} \ --build-arg BUILD_NUMBER=${BUILD_NUMBER} \
-t cafeteria-backend:${BUILD_NUMBER} ./backend -t cafeteria-backend:latest \
-t cafeteria-backend:${BUILD_NUMBER} \
./backend
docker build \ docker build \
-t cafeteria-frontend:${BUILD_NUMBER} ./frontend -t cafeteria-frontend:latest \
-t cafeteria-frontend:${BUILD_NUMBER} \
./frontend
''' '''
} }
} }
stage('Deploy frontend & backend') { stage('Deploy frontend & backend') {
when {
branch 'main'
}
agent any agent any
steps { steps {
sh ''' sh '''
set -e set -e
echo "Deploying build ${BUILD_NUMBER}" : "${BACKEND_PORT:?Missing BACKEND_PORT}"
: "${BACKEND_HEALTH_URL:?Missing BACKEND_HEALTH_URL}"
: "${FRONTEND_PORT:?Missing FRONTEND_PORT}"
: "${FRONTEND_HEALTH_URL:?Missing FRONTEND_HEALTH_URL}"
docker rm -f cafeteria-backend cafeteria-frontend 2>/dev/null || true
# Backend
docker tag cafeteria-backend:latest cafeteria-backend:previous || true
docker rm -f cafeteria-backend 2>/dev/null || true
docker run -d \ docker run -d \
--name cafeteria-backend \ --name cafeteria-backend \
-p 8000:8000 \ -p "$BACKEND_PORT":"$BACKEND_PORT" \
cafeteria-backend:${BUILD_NUMBER} cafeteria-backend:latest
sleep 5
if ! curl -fs "$BACKEND_HEALTH_URL"; then
echo "Backend failed, rollback"
docker rm -f cafeteria-backend
docker run -d \
--name cafeteria-backend \
-p "$BACKEND_PORT":"$BACKEND_PORT" \
cafeteria-backend:previous
exit 1
fi
# Frontend
docker tag cafeteria-frontend:latest cafeteria-frontend:previous || true
docker rm -f cafeteria-frontend 2>/dev/null || true
docker run -d \ docker run -d \
--name cafeteria-frontend \ --name cafeteria-frontend \
-p 3000:80 \ -p "$FRONTEND_PORT":80 \
cafeteria-frontend:${BUILD_NUMBER} cafeteria-frontend:latest
sleep 3
if ! curl -fs "$FRONTEND_HEALTH_URL"; then
echo "Frontend failed, rollback"
docker rm -f cafeteria-frontend
docker run -d \
--name cafeteria-frontend \
-p "$FRONTEND_PORT":80 \
cafeteria-frontend:previous
exit 1
fi
''' '''
} }
} }
@@ -189,11 +158,11 @@ pipeline {
post { post {
always { always {
script { sh '''
node { docker image prune -a -f || true
docker builder prune -a -f || true
'''
cleanWs() cleanWs()
} }
} }
} }
}
}

View File

@@ -1,10 +1,22 @@
FROM python:3.11-slim AS base FROM python:3.11-slim AS builder
WORKDIR /build
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
&& rm -rf /var/lib/apt/lists/*
COPY requirements.txt .
RUN pip wheel --no-cache-dir --no-deps -r requirements.txt -w /build/wheels
FROM python:3.11-slim
WORKDIR /app
# ---- Build args (desde Jenkins) ---- # ---- Build args (desde Jenkins) ----
ARG APP_VERSION=dev ARG APP_VERSION=dev
ARG GIT_COMMIT=local ARG GIT_COMMIT=local
ARG COMMIT_AUTHOR=local ARG COMMIT_AUTHOR=local
ARG BUILD_NUMBER= ARG BUILD_NUMBER=local
# ---- Runtime env ---- # ---- Runtime env ----
ENV APP_VERSION=${APP_VERSION} \ ENV APP_VERSION=${APP_VERSION} \
@@ -21,18 +33,10 @@ LABEL app.version="${APP_VERSION}" \
git.author="${COMMIT_AUTHOR}" \ git.author="${COMMIT_AUTHOR}" \
build.number="${BUILD_NUMBER}" build.number="${BUILD_NUMBER}"
COPY --from=builder /build/wheels /wheels
WORKDIR /app RUN pip install --no-cache-dir /wheels/* && rm -rf /wheels
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential curl \
&& rm -rf /var/lib/apt/lists/*
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
COPY app ./app COPY app ./app
EXPOSE 8000 EXPOSE 8000
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]