Proyecto-SaaS/django-core-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'pre-dev' (#1) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Details

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
jjminguez
2026-04-12 02:25:14 +00:00
parent 1752b88bc3 c9c54e6671
commit 14e2036bd0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,6 +1,6 @@
# django-core-base # django-core-base
// V-Encore Lab: Sistema Automatizado v1.0.3 // V-Encore Lab: Sistema Automatizado v1.0.4

9
deployments/Jenkinsfile vendored
View File

@@ -6,12 +6,12 @@ pipeline {
steps { steps {
script { script {
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'master') {
env.PROJECT_NAME = "django_master" // <--- Nombre único env.PROJECT_NAME = "django_master"
env.CONTAINER_NAME = "django_app_master" env.CONTAINER_NAME = "django_app_master"
env.PORT = "8001" env.PORT = "8001"
env.DEBUG_MODE = "0" env.DEBUG_MODE = "0"
} else { } else {
env.PROJECT_NAME = "django_dev" // <--- Nombre único env.PROJECT_NAME = "django_dev"
env.CONTAINER_NAME = "django_app_dev" env.CONTAINER_NAME = "django_app_dev"
env.PORT = "8000" env.PORT = "8000"
env.DEBUG_MODE = "1" env.DEBUG_MODE = "1"
@@ -25,15 +25,14 @@ pipeline {
steps { steps {
echo "DESPLEGANDO: ${env.CONTAINER_NAME} en el puerto ${env.PORT}" echo "DESPLEGANDO: ${env.CONTAINER_NAME} en el puerto ${env.PORT}"
// 1. Levantamos el contenedor con su nombre de proyecto único (-p) // Usamos docker-compose con guion para asegurar compatibilidad
sh """ sh """
CONTAINER_NAME=${env.CONTAINER_NAME} \ CONTAINER_NAME=${env.CONTAINER_NAME} \
PORT=${env.PORT} \ PORT=${env.PORT} \
DEBUG_MODE=${env.DEBUG_MODE} \ DEBUG_MODE=${env.DEBUG_MODE} \
docker compose -p ${env.PROJECT_NAME} -f deployments/docker-compose.yml up -d --build web docker-compose -p ${env.PROJECT_NAME} -f deployments/docker-compose.yml up -d --build web
""" """
// 2. Ejecutamos migraciones automáticamente al terminar
echo "Ejecutando migraciones en ${env.CONTAINER_NAME}..." echo "Ejecutando migraciones en ${env.CONTAINER_NAME}..."
sh "docker exec ${env.CONTAINER_NAME} python manage.py migrate --noinput" sh "docker exec ${env.CONTAINER_NAME} python manage.py migrate --noinput"
} }