From 9804712643cfc666f49d53e09b3dfb1e3f262e18 Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sat, 11 Apr 2026 23:18:34 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71ed8bd..ba20b40 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # django-core-base -// V-Encore Lab: Sistema Automatizado v1.0.3 +// V-Encore Lab: Sistema Automatizado v1.0.4 From c9c54e66710831edb73ec22c059dd92997c3a13f Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:20:03 +0200 Subject: [PATCH 2/2] Update Jenkinsfile --- deployments/Jenkinsfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deployments/Jenkinsfile b/deployments/Jenkinsfile index 3042977..1155c11 100644 --- a/deployments/Jenkinsfile +++ b/deployments/Jenkinsfile @@ -6,12 +6,12 @@ pipeline { steps { script { if (env.BRANCH_NAME == 'master') { - env.PROJECT_NAME = "django_master" // <--- Nombre único + env.PROJECT_NAME = "django_master" env.CONTAINER_NAME = "django_app_master" env.PORT = "8001" env.DEBUG_MODE = "0" } else { - env.PROJECT_NAME = "django_dev" // <--- Nombre único + env.PROJECT_NAME = "django_dev" env.CONTAINER_NAME = "django_app_dev" env.PORT = "8000" env.DEBUG_MODE = "1" @@ -25,15 +25,14 @@ pipeline { steps { 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 """ CONTAINER_NAME=${env.CONTAINER_NAME} \ PORT=${env.PORT} \ 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}..." sh "docker exec ${env.CONTAINER_NAME} python manage.py migrate --noinput" }