From 9804712643cfc666f49d53e09b3dfb1e3f262e18 Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sat, 11 Apr 2026 23:18:34 +0200 Subject: [PATCH 1/8] 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/8] 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" } From 375291514ee05dc272e75ee2e95e146422e0c18e Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:36:59 +0200 Subject: [PATCH 3/8] fix --- .env | 4 ++-- deployments/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 7c504b4..f8f4030 100644 --- a/.env +++ b/.env @@ -5,6 +5,6 @@ SECRET_KEY=una-clave-muy-secreta-y-larga-123456 # Base de Datos (Conectando al PostgreSQL que instalamos) DB_NAME=gitea DB_USER=gitea -DB_PASSWORD=gitea_password -DB_HOST=db +DB_PASSWORD=gitea +DB_HOST=gitea-db DB_PORT=5432 \ No newline at end of file diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 55ece57..6f018f9 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -15,11 +15,11 @@ services: - DB_HOST=gitea-db-1 - DB_PORT=5432 networks: - - gitea_net + - gitea_default ports: - "${PORT}:8000" networks: - gitea_net: + gitea_default: external: true name: frontend \ No newline at end of file From 0ce055444390888b200f151797a0427664418b5d Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:39:31 +0200 Subject: [PATCH 4/8] Update docker-compose.yml --- deployments/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 6f018f9..09e5d2a 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -12,7 +12,7 @@ services: - DB_NAME=gitea - DB_USER=gitea - DB_PASSWORD=gitea - - DB_HOST=gitea-db-1 + - DB_HOST=gitea-db - DB_PORT=5432 networks: - gitea_default From c8aa23b564feedb1c9fd7c7eef417950fae801b0 Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:43:02 +0200 Subject: [PATCH 5/8] fix --- .env | 2 +- deployments/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index f8f4030..f1c8cb2 100644 --- a/.env +++ b/.env @@ -6,5 +6,5 @@ SECRET_KEY=una-clave-muy-secreta-y-larga-123456 DB_NAME=gitea DB_USER=gitea DB_PASSWORD=gitea -DB_HOST=gitea-db +DB_HOST=gitea-db-1 DB_PORT=5432 \ No newline at end of file diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 09e5d2a..6f018f9 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -12,7 +12,7 @@ services: - DB_NAME=gitea - DB_USER=gitea - DB_PASSWORD=gitea - - DB_HOST=gitea-db + - DB_HOST=gitea-db-1 - DB_PORT=5432 networks: - gitea_default From 02feaf445dba31f664dcbe9af448b9b686cda8c7 Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:46:31 +0200 Subject: [PATCH 6/8] Update .env --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index f1c8cb2..f8f4030 100644 --- a/.env +++ b/.env @@ -6,5 +6,5 @@ SECRET_KEY=una-clave-muy-secreta-y-larga-123456 DB_NAME=gitea DB_USER=gitea DB_PASSWORD=gitea -DB_HOST=gitea-db-1 +DB_HOST=gitea-db DB_PORT=5432 \ No newline at end of file From 02bc67c5fd8dd3152b34de2a94622c613f9ca2d8 Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:49:56 +0200 Subject: [PATCH 7/8] Update docker-compose.yml --- deployments/docker-compose.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index 6f018f9..c9200b6 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -5,21 +5,24 @@ services: dockerfile: deployments/Dockerfile container_name: ${CONTAINER_NAME} restart: always - working_dir: /app # <--- Vital para que encuentre 'core' + working_dir: /app environment: - DEBUG=${DEBUG_MODE} - - PYTHONPATH=/app # <--- Asegura que Python vea las carpetas + - PYTHONPATH=/app - DB_NAME=gitea - DB_USER=gitea - DB_PASSWORD=gitea - - DB_HOST=gitea-db-1 + # CAMBIO CLAVE: Usamos el nombre del servicio, no el del contenedor con el "-1" + - DB_HOST=gitea-db - DB_PORT=5432 networks: - - gitea_default + - gitea_network ports: - "${PORT}:8000" networks: - gitea_default: + gitea_network: external: true - name: frontend \ No newline at end of file + # IMPORTANTE: Aquí debe ir el nombre que te salió al hacer 'docker network ls' + # Si tu red se llama 'gitea_default', pon ese nombre aquí. + name: gitea_default \ No newline at end of file From 0971134702503fd69c3bd2d9de9ff5fc74a5c7ee Mon Sep 17 00:00:00 2001 From: minguezsanzjuanjose Date: Sun, 12 Apr 2026 04:51:32 +0200 Subject: [PATCH 8/8] Update docker-compose.yml --- deployments/docker-compose.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index c9200b6..bee6a3f 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -11,18 +11,15 @@ services: - PYTHONPATH=/app - DB_NAME=gitea - DB_USER=gitea - - DB_PASSWORD=gitea - # CAMBIO CLAVE: Usamos el nombre del servicio, no el del contenedor con el "-1" - - DB_HOST=gitea-db + - DB_PASSWORD=gitea # <-- Asegúrate de que esta sea la que pusiste en la web de Gitea + - DB_HOST=gitea-db # <-- IMPORTANTE: Nombre del servicio, sin el "-1" - DB_PORT=5432 networks: - - gitea_network + - gitea_bridge # <-- Conectamos el servicio a nuestro puente ports: - "${PORT}:8000" networks: - gitea_network: + gitea_bridge: # <-- Definimos el puente external: true - # IMPORTANTE: Aquí debe ir el nombre que te salió al hacer 'docker network ls' - # Si tu red se llama 'gitea_default', pon ese nombre aquí. - name: gitea_default \ No newline at end of file + name: root_gitea_gitea # <-- ESTE es el nombre real que sale en tu 'docker network ls' \ No newline at end of file