From 533f76f68a153c737381e38a5a24f77c37e2e93c Mon Sep 17 00:00:00 2001 From: juanjo <130799031+juanminguezsanz2023@users.noreply.github.com> Date: Sat, 11 Apr 2026 14:53:34 +0200 Subject: [PATCH] fix deployments --- deployments/Jenkinsfile | 17 +++++++++-------- deployments/docker-compose.yml | 7 ++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/deployments/Jenkinsfile b/deployments/Jenkinsfile index 9639dae..bd62429 100644 --- a/deployments/Jenkinsfile +++ b/deployments/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any environment { - // Valores por defecto para evitar errores + // Valores iniciales por seguridad CONTAINER_NAME = "django_app_dev" PORT = "8000" DEBUG_MODE = "1" @@ -14,14 +14,14 @@ pipeline { script { if (env.BRANCH_NAME == 'master') { echo "--- CONFIGURANDO MODO PRODUCCIÓN (MASTER) ---" - CONTAINER_NAME = "django_app_master" - PORT = "8001" - DEBUG_MODE = "0" + env.CONTAINER_NAME = "django_app_master" + env.PORT = "8001" + env.DEBUG_MODE = "0" } else if (env.BRANCH_NAME == 'dev') { echo "--- CONFIGURANDO MODO DESARROLLO (DEV) ---" - CONTAINER_NAME = "django_app_dev" - PORT = "8000" - DEBUG_MODE = "1" + env.CONTAINER_NAME = "django_app_dev" + env.PORT = "8000" + env.DEBUG_MODE = "1" } } } @@ -32,7 +32,8 @@ pipeline { anyOf { branch 'dev'; branch 'master' } } steps { - // Usamos las variables que configuramos arriba + echo "Desplegando contenedor: ${env.CONTAINER_NAME} en puerto: ${env.PORT}" + // Ahora Docker Compose sí recibirá los valores correctamente sh "docker compose -f deployments/docker-compose.yml up -d --build" } } diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 4b5fd82..ef72f20 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -11,4 +11,9 @@ services: networks: - frontend ports: - - "${PORT}:8000" \ No newline at end of file + - "${PORT}:8000" + +# --- ESTA ES LA PARTE QUE FALTABA --- +networks: + frontend: + driver: bridge \ No newline at end of file