From 69a35ecf5836dd9564da2a7459d8a9c9c4a47eaa Mon Sep 17 00:00:00 2001 From: juanjo <130799031+juanminguezsanz2023@users.noreply.github.com> Date: Sat, 11 Apr 2026 13:20:54 +0200 Subject: [PATCH] cambio estructura de datos fix --- Dockerfile => deployments/Dockerfile | 0 Jenkinsfile => deployments/Jenkinsfile | 0 deployments/docker-compose.yml | 12 ++++++++++++ deployments/requirements.txt | 2 ++ docker-compose.yml | 22 ---------------------- 5 files changed, 14 insertions(+), 22 deletions(-) rename Dockerfile => deployments/Dockerfile (100%) rename Jenkinsfile => deployments/Jenkinsfile (100%) create mode 100644 deployments/docker-compose.yml create mode 100644 deployments/requirements.txt delete mode 100644 docker-compose.yml diff --git a/Dockerfile b/deployments/Dockerfile similarity index 100% rename from Dockerfile rename to deployments/Dockerfile diff --git a/Jenkinsfile b/deployments/Jenkinsfile similarity index 100% rename from Jenkinsfile rename to deployments/Jenkinsfile diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml new file mode 100644 index 0000000..dd4f9bc --- /dev/null +++ b/deployments/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.8' + +networks: + # Usamos la red que creamos al principio para que el Proxy lo vea + frontend: + external: true + +services: + web: + build: . + container_name: django_app_dev + restart \ No newline at end of file diff --git a/deployments/requirements.txt b/deployments/requirements.txt new file mode 100644 index 0000000..f6ec772 --- /dev/null +++ b/deployments/requirements.txt @@ -0,0 +1,2 @@ +Django==5.0.3 +psycopg2-binary==2. \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 867c6af..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: '3.8' - -networks: - # Usamos la red que creamos al principio para que el Proxy lo vea - frontend: - external: true - -services: - web: - build: . - container_name: django_app_dev - restart: always - environment: - - DEBUG=1 - - DATABASE_URL=postgres://gitea:gitea_password@db:5432/gitea - # Usamos la base de datos de Gitea para empezar, o luego creamos una aparte - volumes: - - .:/app - networks: - - frontend - ports: - - "8000:8000" \ No newline at end of file