From b5ace86a03ac288dc4612d63c5d0a5f666f8d081 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 17:33:30 +0100
Subject: [PATCH 01/16] Change port

---
 docker-compose.yml  | 2 +-
 frontend/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5bc14c9..d6a08b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       context: ./frontend
     image: cafeteria-frontend:${FRONTEND_TAG}
     ports:
-      - "80:80"
+      - "8081:8081"
     depends_on:
       backend:
         condition: service_healthy
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 12c2eae..a28b467 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -8,5 +8,5 @@ RUN npm run build
 FROM nginx:1.27-alpine AS final
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=build /app/dist /usr/share/nginx/html
-EXPOSE 80
+EXPOSE 8081
 CMD ["nginx", "-g", "daemon off;"]

From 93fdce1d6e10e69ef190632ecd9be587264532a7 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 17:33:48 +0100
Subject: [PATCH 02/16] Change jenkins url

---
 Jenkinsfile.cd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index af4c8e4..4a1d445 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -94,8 +94,8 @@ pipeline {
       }
       agent any
       environment {
-        JENKINS_BASE_URL = 'http://jenkins:8080'
-        JENKINS_JOB_NAME = 'Espetos'
+        JENKINS_BASE_URL = 'https://openbokeron.org/jenkins'
+        JENKINS_JOB_NAME = 'TallerCiCd'
       }
       steps {
         withCredentials([

From 48dd10ea056e55d23cadfb542fcbc52f67287b74 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 17:34:06 +0100
Subject: [PATCH 03/16] Prevent creation of pycache directory

---
 Jenkinsfile.ci | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
index fac7695..3d26508 100644
--- a/Jenkinsfile.ci
+++ b/Jenkinsfile.ci
@@ -41,6 +41,11 @@ pipeline {
           args '-u root'
         }
       }
+
+      environment {
+        PYTHONDONTWRITEBYTECODE = 1
+      }
+
       steps {
         dir('backend') {
           sh '''

From 26128feb7e72a59eabd6083a0640604e094d6fa4 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 17:46:32 +0100
Subject: [PATCH 04/16] Update listening port

---
 frontend/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index bb3f608..785c42c 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -1,5 +1,5 @@
 server {
-  listen 80;
+  listen 8081;
   server_name _;
 
   root /usr/share/nginx/html;

From 1191ef9f1ff9d4787d051dc04aa81383a7f90105 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 18:02:41 +0100
Subject: [PATCH 05/16] Update context path

---
 frontend/vite.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index ac8bbe8..e5764f0 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 
 export default defineConfig({
+    base: '/taller',
     plugins: [svelte()],
     test: {
         environment: 'jsdom',

From c74cc19d1bfa3ca22750067fdaf93cfd069952cc Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 18:30:53 +0100
Subject: [PATCH 06/16] Add context path

---
 frontend/Dockerfile     | 2 +-
 frontend/nginx.conf     | 4 ++--
 frontend/src/App.svelte | 2 +-
 frontend/vite.config.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index a28b467..9ead6b2 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -7,6 +7,6 @@ RUN npm run build
 
 FROM nginx:1.27-alpine AS final
 COPY nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html/taller
 EXPOSE 8081
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 785c42c..4e23060 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -5,7 +5,7 @@ server {
   root /usr/share/nginx/html;
   index index.html;
 
-  location / {
-    try_files $uri /index.html;
+  location /taller/ {
+    try_files $uri $uri/ /index.html;
   }
 }
diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 5e1298b..4782c98 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -467,7 +467,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                 <div class="openbokeron-logo">
                     <div class="logo-bubble">
                         <img
-                            src="/open-bokeron-logo.png"
+                            src={`${import.meta.env.BASE_URL}/open-bokeron-logo.png`}
                             alt="Logo de Open Bokeron"
                             loading="lazy"
                         />
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index e5764f0..8b8818e 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -2,7 +2,7 @@ import { defineConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 
 export default defineConfig({
-    base: '/taller',
+    base: '/taller/',
     plugins: [svelte()],
     test: {
         environment: 'jsdom',

From 7de0f434c3fa6f165ec3846c7829127cb32a1617 Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <me@pabloferreiro.es>
Date: Tue, 23 Dec 2025 18:40:11 +0100
Subject: [PATCH 07/16] docker network

---
 docker-compose.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index d6a08b8..63ff166 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,8 @@ services:
     build:
       context: ./backend
     image: cafeteria-backend:${BACKEND_TAG}
+    networks:
+      - cafeteria
     ports:
       - "8000:8000"
     environment:
@@ -27,9 +29,18 @@ services:
     build:
       context: ./frontend
     image: cafeteria-frontend:${FRONTEND_TAG}
+    networks:
+      - cafeteria
     ports:
       - "8081:8081"
     depends_on:
       backend:
         condition: service_healthy
     restart: unless-stopped
+
+networks:
+  cafeteria:
+    enable_ipv6: true
+    ipam:
+      config:
+        - subnet: 2001:db8::/64

From a2f21e1286b5ff1bf6fc75f5e84be682c5e646b5 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Tue, 23 Dec 2025 18:53:36 +0100
Subject: [PATCH 08/16] Add vite api base

---
 docker-compose.yml  | 2 ++
 frontend/Dockerfile | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 63ff166..f35247d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,8 @@ services:
     build:
       context: ./frontend
     image: cafeteria-frontend:${FRONTEND_TAG}
+    environment:
+      VITE_API_BASE: ${VITE_API_BASE}
     networks:
       - cafeteria
     ports:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 9ead6b2..58ea81b 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,6 +1,8 @@
 FROM node:20-slim AS build
 WORKDIR /app
 COPY package*.json ./
+ARG VITE_API_BASE
+ENV VITE_API_BASE=$VITE_API_BASE
 RUN npm install --no-progress
 COPY . .
 RUN npm run build

From a9baf6da95b8634a16b028be5a593ca0087b350d Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Wed, 24 Dec 2025 12:44:34 +0100
Subject: [PATCH 09/16] =?UTF-8?q?Parametrize=20configurations=C2=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example            |  7 +++++++
 Jenkinsfile.cd          | 33 ++++++++++++++++++++++++--------
 README.md               | 11 +++++++++++
 backend/app/settings.py |  5 ++++-
 docker-compose.yml      | 16 ++++++++--------
 frontend/nginx.conf     | 15 ++++++++++++++-
 frontend/src/config.js  |  6 +++++-
 frontend/vite.config.js | 42 ++++++++++++++++++++++++++++++-----------
 8 files changed, 105 insertions(+), 30 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..4d4f73b
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,7 @@
+BACKEND_TAG=latest
+FRONTEND_TAG=latest
+VITE_API_BASE=/taller/api
+JENKINS_BASE_URL=http://host.docker.internal:8080
+JENKINS_JOB_NAME=TallerCiCd
+JENKINS_USER=
+JENKINS_TOKEN=
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index 4a1d445..7f39b85 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -5,10 +5,31 @@ pipeline {
     timestamps()
   }
 
+  parameters {
+    string(
+      name: 'JENKINS_BASE_URL',
+      defaultValue: 'https://openbokeron.org/jenkins',
+      description: 'Base URL del Jenkins objetivo'
+    )
+    string(
+      name: 'JENKINS_JOB_NAME',
+      defaultValue: 'TallerCiCd',
+      description: 'Nombre del job que se consulta en Jenkins'
+    )
+    string(
+      name: 'VITE_API_BASE',
+      defaultValue: '/taller/api',
+      description: 'Base path/API para el frontend (build time)'
+    )
+  }
+
   environment {
     NODE_OPTIONS = '--max_old_space_size=2048'
     APP_VERSION = "1.0.${BUILD_NUMBER}"
     DOCKER_BUILDKIT = '1'
+    JENKINS_BASE_URL = "${params.JENKINS_BASE_URL}"
+    JENKINS_JOB_NAME = "${params.JENKINS_JOB_NAME}"
+    VITE_API_BASE = "${params.VITE_API_BASE}"
   }
 
   stages {
@@ -77,6 +98,7 @@ pipeline {
             ./backend
 
           docker build \
+            --build-arg VITE_API_BASE=${VITE_API_BASE} \
             -t cafeteria-frontend:${BUILD_NUMBER} \
             -t cafeteria-frontend:latest \
             ./frontend
@@ -93,10 +115,6 @@ pipeline {
         branch 'main'
       }
       agent any
-      environment {
-        JENKINS_BASE_URL = 'https://openbokeron.org/jenkins'
-        JENKINS_JOB_NAME = 'TallerCiCd'
-      }
       steps {
         withCredentials([
           usernamePassword(
@@ -110,15 +128,14 @@ pipeline {
 
             echo "Deploying backend ${BUILD_NUMBER}"
 
-            echo "BACKEND_TAG=${BUILD_NUMBER}" > .env
-            echo "FRONTEND_TAG=${BUILD_NUMBER}" >> .env
-
-            docker-compose up -d
+            BACKEND_TAG=${BUILD_NUMBER} FRONTEND_TAG=${BUILD_NUMBER} docker-compose up -d
           '''
         }
       }
     }
 
+
+
     stage('Cleanup') {
         agent any
         steps {
diff --git a/README.md b/README.md
index 6b2a65c..c2ec283 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,16 @@
 - Python 3.11+ y `pip`
 - Node 18+ y `npm`
 
+## Configuracion de entorno (local/prod)
+Variables que usa `docker-compose` y el frontend:
+```bash
+cp .env.example .env
+```
+Notas:
+- `VITE_API_BASE` por defecto apunta a `/taller/api` y el frontend proxya a la API.
+- Para Jenkins local en contenedor: `JENKINS_BASE_URL=http://jenkins:8080`. Se hace necesario que back y jenkins estén en la misma red de Docker si se quiere probar en local.
+- Para VPS: `JENKINS_BASE_URL=https://openbokeron.org/jenkins`.
+
 ## Backend (FastAPI)
 ```bash
 cd backend
@@ -42,6 +52,7 @@ cd frontend
 npm install
 npm run dev -- --host --port 5173
 ```
+Abrir `http://localhost:5173/taller/`.
 Tests, lint/check:
 ```bash
 cd frontend
diff --git a/backend/app/settings.py b/backend/app/settings.py
index 79c78a5..6c9d46d 100644
--- a/backend/app/settings.py
+++ b/backend/app/settings.py
@@ -24,7 +24,10 @@ class RuntimeConfig:
     git_commit: str = os.getenv("GIT_COMMIT", "local")
     build_number: str = os.getenv("BUILD_NUMBER", "-")
     commit_author: str = os.getenv("COMMIT_AUTHOR", "local")
-    jenkins_base_url: str = os.getenv("JENKINS_BASE_URL", "localhost:8080")
+    jenkins_base_url: str = os.getenv(
+        "JENKINS_BASE_URL",
+        "http://localhost:8080"
+    ).rstrip("/")
     jenkins_job_name: str = os.getenv("JENKINS_JOB_NAME", "")
     jenkins_user: str = os.getenv("JENKINS_USER", "")
     jenkins_token: str = os.getenv("JENKINS_TOKEN", "")
diff --git a/docker-compose.yml b/docker-compose.yml
index f35247d..7692ea1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,16 +2,16 @@ services:
   backend:
     build:
       context: ./backend
-    image: cafeteria-backend:${BACKEND_TAG}
+    image: cafeteria-backend:${BACKEND_TAG:-latest}
     networks:
       - cafeteria
     ports:
       - "8000:8000"
     environment:
-      JENKINS_BASE_URL: ${JENKINS_BASE_URL}
-      JENKINS_JOB_NAME: ${JENKINS_JOB_NAME}
-      JENKINS_USER: ${JENKINS_USER}
-      JENKINS_TOKEN: ${JENKINS_TOKEN}
+      JENKINS_BASE_URL: ${JENKINS_BASE_URL:-http://jenkins:8080}
+      JENKINS_JOB_NAME: ${JENKINS_JOB_NAME:-TallerCiCd}
+      JENKINS_USER: ${JENKINS_USER:-}
+      JENKINS_TOKEN: ${JENKINS_TOKEN:-}
     restart: unless-stopped
     healthcheck:
       test:
@@ -28,9 +28,9 @@ services:
   frontend:
     build:
       context: ./frontend
-    image: cafeteria-frontend:${FRONTEND_TAG}
-    environment:
-      VITE_API_BASE: ${VITE_API_BASE}
+      args:
+        VITE_API_BASE: ${VITE_API_BASE:-/taller/api}
+    image: cafeteria-frontend:${FRONTEND_TAG:-latest}
     networks:
       - cafeteria
     ports:
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 4e23060..6225c35 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -5,7 +5,20 @@ server {
   root /usr/share/nginx/html;
   index index.html;
 
+  location = /taller {
+    return 301 /taller/;
+  }
+
+  location /taller/api/ {
+    proxy_pass http://backend:8000/;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+  }
+
   location /taller/ {
-    try_files $uri $uri/ /index.html;
+    try_files $uri $uri/ /taller/index.html;
   }
 }
diff --git a/frontend/src/config.js b/frontend/src/config.js
index 3a8669e..bcedd0a 100644
--- a/frontend/src/config.js
+++ b/frontend/src/config.js
@@ -16,5 +16,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-export const API_BASE = import.meta.env.VITE_API_BASE || 'http://localhost:8000';
+const baseUrl = import.meta.env.BASE_URL || '/';
+const defaultApiBase = `${baseUrl.replace(/\/$/, '')}/api`;
+const rawApiBase = import.meta.env.VITE_API_BASE || defaultApiBase;
+
+export const API_BASE = rawApiBase.replace(/\/$/, '');
 export const ENABLE_POLLING = import.meta.env.MODE !== 'test';
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 8b8818e..d8aba27 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -1,14 +1,34 @@
-import { defineConfig } from 'vite';
+import { defineConfig, loadEnv } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 
-export default defineConfig({
-    base: '/taller/',
-    plugins: [svelte()],
-    test: {
-        environment: 'jsdom',
-        globals: true,
-    },
-    server: {
-        port: 5173,
-    },
+export default defineConfig(({ mode }) => {
+    const env = loadEnv(mode, process.cwd(), 'VITE_');
+    const basePath = '/taller/';
+    const defaultApiBase = `${basePath.replace(/\/$/, '')}/api`;
+    const apiBase = (env.VITE_API_BASE || defaultApiBase).replace(/\/$/, '');
+    const apiProxyPath = apiBase.startsWith('http') ? null : apiBase;
+
+    return {
+        base: basePath,
+        plugins: [svelte()],
+        test: {
+            environment: 'jsdom',
+            globals: true,
+        },
+        server: {
+            port: 5173,
+            proxy: apiProxyPath
+                ? {
+                      [apiProxyPath]: {
+                          target: 'http://localhost:8000',
+                          changeOrigin: true,
+                          rewrite: (path) =>
+                              path.startsWith(apiProxyPath)
+                                  ? path.slice(apiProxyPath.length) || '/'
+                                  : path,
+                      },
+                  }
+                : undefined,
+        },
+    };
 });

From 12817a7e82e8d91807cd40e790d937f57093c960 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Wed, 24 Dec 2025 13:37:00 +0100
Subject: [PATCH 10/16] Rotate images

---
 Jenkinsfile.cd | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index 7f39b85..1f87dc1 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -88,20 +88,55 @@ pipeline {
         sh '''
           set -e
 
+          OLD_BACKEND_LATEST_ID=$(docker images -q cafeteria-backend:latest || true)
+          OLD_BACKEND_PREVIOUS_ID=$(docker images -q cafeteria-backend:previous || true)
+          OLD_FRONTEND_LATEST_ID=$(docker images -q cafeteria-frontend:latest || true)
+          OLD_FRONTEND_PREVIOUS_ID=$(docker images -q cafeteria-frontend:previous || true)
+
           docker build \
             --build-arg APP_VERSION=${APP_VERSION} \
             --build-arg GIT_COMMIT=${COMMIT_SHORT} \
             --build-arg COMMIT_AUTHOR="${COMMIT_AUTHOR}" \
             --build-arg BUILD_NUMBER=${BUILD_NUMBER} \
-            -t cafeteria-backend:${BUILD_NUMBER} \
             -t cafeteria-backend:latest \
             ./backend
 
           docker build \
             --build-arg VITE_API_BASE=${VITE_API_BASE} \
-            -t cafeteria-frontend:${BUILD_NUMBER} \
             -t cafeteria-frontend:latest \
             ./frontend
+
+          NEW_BACKEND_LATEST_ID=$(docker images -q cafeteria-backend:latest || true)
+          NEW_FRONTEND_LATEST_ID=$(docker images -q cafeteria-frontend:latest || true)
+
+          if [ -n "$OLD_BACKEND_LATEST_ID" ]; then
+            docker tag "$OLD_BACKEND_LATEST_ID" cafeteria-backend:previous
+          fi
+          if [ -n "$OLD_FRONTEND_LATEST_ID" ]; then
+            docker tag "$OLD_FRONTEND_LATEST_ID" cafeteria-frontend:previous
+          fi
+
+          if [ -n "$OLD_BACKEND_PREVIOUS_ID" ] && \
+             [ "$OLD_BACKEND_PREVIOUS_ID" != "$OLD_BACKEND_LATEST_ID" ] && \
+             [ "$OLD_BACKEND_PREVIOUS_ID" != "$NEW_BACKEND_LATEST_ID" ]; then
+            docker rmi "$OLD_BACKEND_PREVIOUS_ID" || true
+          fi
+
+          if [ -n "$OLD_FRONTEND_PREVIOUS_ID" ] && \
+             [ "$OLD_FRONTEND_PREVIOUS_ID" != "$OLD_FRONTEND_LATEST_ID" ] && \
+             [ "$OLD_FRONTEND_PREVIOUS_ID" != "$NEW_FRONTEND_LATEST_ID" ]; then
+            docker rmi "$OLD_FRONTEND_PREVIOUS_ID" || true
+          fi
+
+          cleanup_tags() {
+            repo="$1"
+            docker images --format "{{.Repository}}:{{.Tag}}" \
+              | awk -v repo="$repo" '$0 ~ "^"repo":" && $0 !~ /:latest$|:previous$/' \
+              | xargs -r docker rmi || true
+          }
+
+          cleanup_tags cafeteria-backend
+          cleanup_tags cafeteria-frontend
         '''
       }
     }
@@ -128,7 +163,7 @@ pipeline {
 
             echo "Deploying backend ${BUILD_NUMBER}"
 
-            BACKEND_TAG=${BUILD_NUMBER} FRONTEND_TAG=${BUILD_NUMBER} docker-compose up -d
+            BACKEND_TAG=latest FRONTEND_TAG=latest docker-compose up -d
           '''
         }
       }

From d49e756c21c255593958cd962f8eb317f8593e75 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Wed, 24 Dec 2025 13:39:10 +0100
Subject: [PATCH 11/16] Update intervals

---
 frontend/src/App.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 4782c98..12f227d 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -96,8 +96,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
         if (!ENABLE_POLLING) return;
 
-        const pricesInterval = setInterval(fetchPrices, 8000);
-        const ciInterval = setInterval(fetchCiStatus, 10000);
+        const pricesInterval = setInterval(fetchPrices, 180000);
+        const ciInterval = setInterval(fetchCiStatus, 300000);
 
         return () => {
             clearInterval(pricesInterval);

From c6780b53fc5b62f9d7224f9e7f08d4c76d38ab39 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Wed, 24 Dec 2025 14:00:06 +0100
Subject: [PATCH 12/16] Use docker compose instead of docker-compose

---
 Jenkinsfile.cd             |  2 +-
 jenkins/Dockerfile.jenkins | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index 1f87dc1..f6ea7fa 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -163,7 +163,7 @@ pipeline {
 
             echo "Deploying backend ${BUILD_NUMBER}"
 
-            BACKEND_TAG=latest FRONTEND_TAG=latest docker-compose up -d
+            BACKEND_TAG=latest FRONTEND_TAG=latest docker compose up -d
           '''
         }
       }
diff --git a/jenkins/Dockerfile.jenkins b/jenkins/Dockerfile.jenkins
index b672f76..cbbe17f 100644
--- a/jenkins/Dockerfile.jenkins
+++ b/jenkins/Dockerfile.jenkins
@@ -3,10 +3,15 @@ FROM jenkins/jenkins:lts
 USER root
 
 RUN apt-get update \
- && apt-get install -y docker.io curl \
- && curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64 \
-      -o /usr/local/bin/docker-compose \
- && chmod +x /usr/local/bin/docker-compose \
+ && apt-get install -y ca-certificates curl gnupg \
+ && install -m 0755 -d /etc/apt/keyrings \
+ && curl -fsSL https://download.docker.com/linux/debian/gpg \
+      | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+ && chmod a+r /etc/apt/keyrings/docker.gpg \
+ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo \"$VERSION_CODENAME\") stable" \
+      > /etc/apt/sources.list.d/docker.list \
+ && apt-get update \
+ && apt-get install -y docker-ce-cli docker-compose-plugin \
  && rm -rf /var/lib/apt/lists/*
 
 USER jenkins

From 8901941e9ffa4bbc6f825d2dba050fecea3bd51a Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Wed, 24 Dec 2025 17:52:14 +0100
Subject: [PATCH 13/16] Delete conditions

---
 Jenkinsfile.cd | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index f6ea7fa..96cd4df 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -30,6 +30,7 @@ pipeline {
     JENKINS_BASE_URL = "${params.JENKINS_BASE_URL}"
     JENKINS_JOB_NAME = "${params.JENKINS_JOB_NAME}"
     VITE_API_BASE = "${params.VITE_API_BASE}"
+    PYTHONDONTWRITEBYTECODE = 1
   }
 
   stages {
@@ -39,9 +40,6 @@ pipeline {
        ========================= */
 
     stage('Backend: test (main)') {
-      when {
-        branch 'main'
-      }
       agent {
         docker {
           image 'python:3.11-slim'
@@ -68,9 +66,6 @@ pipeline {
        ========================= */
 
     stage('Docker: build images') {
-      when {
-        branch 'main'
-      }
       agent any
 
       steps {
@@ -146,9 +141,6 @@ pipeline {
        ========================= */
 
     stage('Deploy (docker compose)') {
-      when {
-        branch 'main'
-      }
       agent any
       steps {
         withCredentials([

From 558a3198f42970b8ff6a2519c800fe4ea1b4ddab Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Wed, 24 Dec 2025 18:23:35 +0100
Subject: [PATCH 14/16] Revert image rotation

---
 Jenkinsfile.cd | 56 +++++++++++++-------------------------------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index 96cd4df..a14ab7c 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -2,6 +2,7 @@ pipeline {
   agent none
 
   options {
+    disableConcurrentBuilds()
     timestamps()
   }
 
@@ -13,7 +14,7 @@ pipeline {
     )
     string(
       name: 'JENKINS_JOB_NAME',
-      defaultValue: 'TallerCiCd',
+      defaultValue: 'CD',
       description: 'Nombre del job que se consulta en Jenkins'
     )
     string(
@@ -33,6 +34,14 @@ pipeline {
     PYTHONDONTWRITEBYTECODE = 1
   }
 
+  triggers {
+    gitea(
+        branchFilterType: 'Include',
+        branchFilter: 'main',
+        secret: ''
+    )
+  }
+
   stages {
 
     /* =========================
@@ -83,55 +92,18 @@ pipeline {
         sh '''
           set -e
 
-          OLD_BACKEND_LATEST_ID=$(docker images -q cafeteria-backend:latest || true)
-          OLD_BACKEND_PREVIOUS_ID=$(docker images -q cafeteria-backend:previous || true)
-          OLD_FRONTEND_LATEST_ID=$(docker images -q cafeteria-frontend:latest || true)
-          OLD_FRONTEND_PREVIOUS_ID=$(docker images -q cafeteria-frontend:previous || true)
-
           docker build \
             --build-arg APP_VERSION=${APP_VERSION} \
             --build-arg GIT_COMMIT=${COMMIT_SHORT} \
             --build-arg COMMIT_AUTHOR="${COMMIT_AUTHOR}" \
             --build-arg BUILD_NUMBER=${BUILD_NUMBER} \
-            -t cafeteria-backend:latest \
+            -t cafeteria-backend:${APP_VERSION} \
             ./backend
 
           docker build \
             --build-arg VITE_API_BASE=${VITE_API_BASE} \
-            -t cafeteria-frontend:latest \
+            -t cafeteria-frontend:${APP_VERSION} \
             ./frontend
-
-          NEW_BACKEND_LATEST_ID=$(docker images -q cafeteria-backend:latest || true)
-          NEW_FRONTEND_LATEST_ID=$(docker images -q cafeteria-frontend:latest || true)
-
-          if [ -n "$OLD_BACKEND_LATEST_ID" ]; then
-            docker tag "$OLD_BACKEND_LATEST_ID" cafeteria-backend:previous
-          fi
-          if [ -n "$OLD_FRONTEND_LATEST_ID" ]; then
-            docker tag "$OLD_FRONTEND_LATEST_ID" cafeteria-frontend:previous
-          fi
-
-          if [ -n "$OLD_BACKEND_PREVIOUS_ID" ] && \
-             [ "$OLD_BACKEND_PREVIOUS_ID" != "$OLD_BACKEND_LATEST_ID" ] && \
-             [ "$OLD_BACKEND_PREVIOUS_ID" != "$NEW_BACKEND_LATEST_ID" ]; then
-            docker rmi "$OLD_BACKEND_PREVIOUS_ID" || true
-          fi
-
-          if [ -n "$OLD_FRONTEND_PREVIOUS_ID" ] && \
-             [ "$OLD_FRONTEND_PREVIOUS_ID" != "$OLD_FRONTEND_LATEST_ID" ] && \
-             [ "$OLD_FRONTEND_PREVIOUS_ID" != "$NEW_FRONTEND_LATEST_ID" ]; then
-            docker rmi "$OLD_FRONTEND_PREVIOUS_ID" || true
-          fi
-
-          cleanup_tags() {
-            repo="$1"
-            docker images --format "{{.Repository}}:{{.Tag}}" \
-              | awk -v repo="$repo" '$0 ~ "^"repo":" && $0 !~ /:latest$|:previous$/' \
-              | xargs -r docker rmi || true
-          }
-
-          cleanup_tags cafeteria-backend
-          cleanup_tags cafeteria-frontend
         '''
       }
     }
@@ -153,9 +125,9 @@ pipeline {
           sh '''
             set -e
 
-            echo "Deploying backend ${BUILD_NUMBER}"
+            echo "Deploying ${APP_VERSION}"
 
-            BACKEND_TAG=latest FRONTEND_TAG=latest docker compose up -d
+            BACKEND_TAG=${APP_VERSION} FRONTEND_TAG=${APP_VERSION} docker compose up -d
           '''
         }
       }

From bc044a10c930bbbeecb48fcccaa86a6b85aa0e63 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Sun, 28 Dec 2025 11:01:55 +0100
Subject: [PATCH 15/16] Change base images

---
 backend/Dockerfile  | 4 ++--
 frontend/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index bd6c2c7..dc40fc3 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-slim AS builder
+FROM docker.io/library/python:3.11-slim AS builder
 WORKDIR /build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -9,7 +9,7 @@ COPY requirements.txt .
 RUN pip wheel --no-cache-dir --no-deps -r requirements.txt -w /build/wheels
 
 
-FROM python:3.11-slim
+FROM docker.io/library/python:3.11-slim
 WORKDIR /app
 
 # ---- Build args (desde Jenkins) ----
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 58ea81b..b453d1b 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20-slim AS build
+FROM docker.io/library/node:20-slim AS build
 WORKDIR /app
 COPY package*.json ./
 ARG VITE_API_BASE
@@ -7,7 +7,7 @@ RUN npm install --no-progress
 COPY . .
 RUN npm run build
 
-FROM nginx:1.27-alpine AS final
+FROM docker.io/library/nginx:1.27-alpine AS final
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=build /app/dist /usr/share/nginx/html/taller
 EXPOSE 8081

From b15630c7eac2e41d2fef561b45974ae35f785431 Mon Sep 17 00:00:00 2001
From: husbando_enjoyer <husbando_enjoyer@altdom.simplelogin.com>
Date: Sun, 28 Dec 2025 11:05:24 +0100
Subject: [PATCH 16/16] Delete trigger

---
 Jenkinsfile.cd | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
index a14ab7c..d766f1b 100644
--- a/Jenkinsfile.cd
+++ b/Jenkinsfile.cd
@@ -34,14 +34,6 @@ pipeline {
     PYTHONDONTWRITEBYTECODE = 1
   }
 
-  triggers {
-    gitea(
-        branchFilterType: 'Include',
-        branchFilter: 'main',
-        secret: ''
-    )
-  }
-
   stages {
 
     /* =========================