From bf91f9dc7cdc74f8168bc908e9da401d257b2d97 Mon Sep 17 00:00:00 2001
From: dmolinari <dmolinari@eldia.com>
Date: Tue, 17 Jun 2025 21:44:34 -0300
Subject: [PATCH] Ya me estoy volviendo loco, copio y pego sugerencias sin
 mirarlas.

---
 .gitea/workflows/deploy.yml | 105 +++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 55 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 74be892..637e4f4 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -6,36 +6,15 @@ on:
       - main
 
 jobs:
-  # ===================================================================
-  # JOB 1: CONSTRUIR Y SUBIR LAS IMÁGENES (FUNCIONA PERFECTAMENTE)
-  # ===================================================================
-  build-and-push:
+  remote-build-and-deploy:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Build Backend Image and Save as Tar
-        run: |
-          # ... (sin cambios aquí)
-
-      - name: Build Frontend Image and Save as Tar
-        run: |
-          # ... (sin cambios aquí)
-
-  # ===================================================================
-  # JOB 2: DESPLEGAR LA APLICACIÓN (LA SOLUCIÓN DEFINITIVA)
-  # ===================================================================
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build-and-push
-    
-    steps:
-      - name: Deploy to Production via SSH
+      - name: Run Entire CI/CD Process on Host via SSH
         run: |
           set -e
 
-          # 1. Preparar el cliente SSH
+          # 1. Preparar el cliente SSH (sin cambios)
           apt-get update > /dev/null && apt-get install -y openssh-client git > /dev/null
           mkdir -p ~/.ssh
           echo "${{ secrets.PROD_SERVER_SSH_KEY }}" > ~/.ssh/id_rsa
@@ -43,38 +22,54 @@ jobs:
           ssh-keyscan -H ${{ secrets.PROD_SERVER_HOST }} >> ~/.ssh/known_hosts
           
           # 2. Conectarse al HOST y ejecutar todo el proceso allí
-          ssh ${{ secrets.PROD_SERVER_USER }}@${{ secrets.PROD_SERVER_HOST }} 'bash -s' \
-            '${{ secrets.DB_SA_PASSWORD_SECRET }}' \
-            '${{ secrets.JWT_KEY_SECRET }}' \
-            << 'EOF'
-              set -e
+          ssh ${{ secrets.PROD_SERVER_USER }}@${{ secrets.PROD_SERVER_HOST }} << EOF
+            set -e
 
-              # --- PARTE 1: PREPARACIÓN ---
-              echo "--- (HOST) Preparing for deployment ---"
-              DB_PASSWORD="$1"
-              JWT_KEY="$2"
+            # --- PARTE 1 Y 2: PREPARACIÓN Y BUILD (SIN CAMBIOS) ---
+            echo "--- (HOST) Preparing temporary workspace & Building... ---"
+            TEMP_DIR="/tmp/gitea-build/${{ gitea.run_id }}"
+            REPO_NAME_RAW="${{ gitea.repository }}"
+            REPO_NAME=\$(echo "\$REPO_NAME_RAW" | tr '[:upper:]' '[:lower:]')
+            GITEA_REPO_PATH="/var/lib/docker/volumes/gitea-stack_gitea-data/_data/git/repositories/\${REPO_NAME}.git"
+            
+            git config --global --add safe.directory "\$GITEA_REPO_PATH"
+            rm -rf \$TEMP_DIR
+            git clone \$GITEA_REPO_PATH \$TEMP_DIR
+            cd \$TEMP_DIR
+            git checkout "${{ gitea.sha }}"
+            
+            docker run --rm -v "\$(pwd)":/workspace gcr.io/kaniko-project/executor:v1.9.0 \
+              --context=/workspace --dockerfile=/workspace/Backend/GestionIntegral.Api/Dockerfile --no-push \
+              --destination=\${REPO_NAME}-backend:latest --tarPath=/workspace/backend.tar
+            docker run --rm -v "\$(pwd)":/workspace gcr.io/kaniko-project/executor:v1.9.0 \
+              --context=/workspace --dockerfile=/workspace/Frontend/Dockerfile --no-push \
+              --destination=\${REPO_NAME}-frontend:latest --tarPath=/workspace/frontend.tar
 
-              # Nos movemos al directorio de la aplicación
-              cd /opt/gestion-integral
-              
-              # --- PARTE 2: CREAR FICHERO .env TEMPORAL ---
-              echo "--- (HOST) Creating temporary .env file ---"
-              # Creamos un fichero .env que docker-compose leerá automáticamente.
-              # Esto es más robusto que usar 'export'.
-              echo "DB_SA_PASSWORD=${DB_PASSWORD}" > .env
-              echo "JWT_KEY=${JWT_KEY}" >> .env
+            # --- PARTE 3: DESPLEGAR (LÓGICA CORREGIDA) ---
+            echo "--- (HOST) Loading images and deploying... ---"
+            
+            docker load < backend.tar
+            docker load < frontend.tar
+            
+            cd /opt/gestion-integral
+            
+            # --- ¡¡LA CORRECCIÓN ESTÁ AQUÍ!! ---
+            # 1. Creamos un archivo .env temporal EN EL HOST.
+            echo "Creating temporary .env file..."
+            cat > .env << ENV_EOF
+            DB_SA_PASSWORD=${{ secrets.DB_SA_PASSWORD_SECRET }}
+            JWT_KEY=${{ secrets.JWT_KEY_SECRET }}
+            ENV_EOF
 
-              # --- PARTE 3: DESPLEGAR ---
-              echo "--- (HOST) Pulling and starting application... ---"
-              # Ya no necesitamos 'export', docker-compose usará el .env
-              docker compose pull
-              docker compose up -d
+            # 2. docker compose leerá automáticamente el archivo .env del directorio actual.
+            echo "Starting application stack..."
+            docker compose up -d
 
-              # --- PARTE 4: LIMPIEZA ---
-              echo "--- (HOST) Cleaning up... ---"
-              # Eliminamos el fichero .env para no dejar secretos en el disco.
-              rm .env
-              docker image prune -af
-              
-              echo "--- ¡¡DESPLIEGUE COMPLETADO Y VERIFICADO!! ---"
+            # --- PARTE 4: LIMPIEZA (INCLUYE EL .env) ---
+            echo "--- (HOST) Cleaning up... ---"
+            rm -rf \$TEMP_DIR
+            rm .env # Borramos el archivo de secretos.
+            docker image prune -af
+            
+            echo "--- ¡¡DESPLIEGUE COMPLETADO Y VERIFICADO!! ---"
           EOF
\ No newline at end of file