From 322f0528608ac6a7b6e7d1b2d4811df19e9def3d Mon Sep 17 00:00:00 2001 From: acazares Date: Thu, 5 Feb 2026 00:04:26 -0600 Subject: [PATCH 1/6] Add deployment step for development environment and clean up invoice report API code --- .gitea/workflows/build.yml | 18 ++++++++++++++++++ .../dashboard/a76/reports/reports-invoices.ts | 4 ---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 760f8edd..fa8b6b60 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - development jobs: build: @@ -53,3 +54,20 @@ jobs: - name: Push frontend run: | docker push dev.aduanasoft.com/anexo76/frontend:latest + + # ------------------------ + # Deploy a Development + # ------------------------ + - name: Deploy a servidor de desarrollo + if: github.ref == 'refs/heads/development' + run: | + eval $(ssh-agent -s) + ssh-add <(echo "${{ secrets.DEV_SERVER_SSH_KEY }}") + ssh -o StrictHostKeyChecking=yes \ + ${{ secrets.DEV_SERVER_USER }}@${{ secrets.DEV_SERVER_HOST }} \ + "cd /opt/anexo76 && \ + echo '${{ secrets.HARBOR_PASSWORD }}' | docker login dev.aduanasoft.com -u '${{ secrets.HARBOR_USERNAME }}' --password-stdin && \ + docker compose pull && \ + docker compose up -d && \ + docker image prune -f" + ssh-agent -k diff --git a/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts b/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts index 7041c3a6..c0725ea9 100644 --- a/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts +++ b/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts @@ -1,5 +1,4 @@ -const BASE_URL = import.meta.env.VITE_API_URL || ''; const BASE_URL = import.meta.env.VITE_API_URL || ''; export const invoicesReportsApi = { @@ -15,7 +14,6 @@ export const invoicesReportsApi = { const token = localStorage.getItem('access_token'); const response = await fetch(endpoint, { - method: 'POST', method: 'POST', headers: { 'Authorization': `Bearer ${token}`, @@ -31,8 +29,6 @@ export const invoicesReportsApi = { getTaskStatus: async (taskId: string) => { const endpoint = `${BASE_URL}/v1/a76/reports/importacion/facturas/tasks/${taskId}`; - const endpoint = `${BASE_URL}/v1/a76/reports/importacion/facturas/tasks/${taskId}`; - const token = localStorage.getItem('access_token'); const response = await fetch(endpoint, { method: 'GET', From 75c62fc62bbd4a3324bf94fd4a91bea75c7e6a4c Mon Sep 17 00:00:00 2001 From: acazares Date: Thu, 5 Feb 2026 00:09:06 -0600 Subject: [PATCH 2/6] Fix escaping of secrets in deployment command for development server --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index fa8b6b60..4df15d4d 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -66,7 +66,7 @@ jobs: ssh -o StrictHostKeyChecking=yes \ ${{ secrets.DEV_SERVER_USER }}@${{ secrets.DEV_SERVER_HOST }} \ "cd /opt/anexo76 && \ - echo '${{ secrets.HARBOR_PASSWORD }}' | docker login dev.aduanasoft.com -u '${{ secrets.HARBOR_USERNAME }}' --password-stdin && \ + echo \${{ secrets.HARBOR_PASSWORD }} | docker login dev.aduanasoft.com -u \${{ secrets.HARBOR_USERNAME }} --password-stdin && \ docker compose pull && \ docker compose up -d && \ docker image prune -f" From b3c1e58fcf37f35a7ecdcc70aab0a60b20882728 Mon Sep 17 00:00:00 2001 From: acazares Date: Thu, 5 Feb 2026 00:10:32 -0600 Subject: [PATCH 3/6] Fix quoting in SSH command for Docker login in development deployment --- .gitea/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 4df15d4d..628330a0 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -65,9 +65,9 @@ jobs: ssh-add <(echo "${{ secrets.DEV_SERVER_SSH_KEY }}") ssh -o StrictHostKeyChecking=yes \ ${{ secrets.DEV_SERVER_USER }}@${{ secrets.DEV_SERVER_HOST }} \ - "cd /opt/anexo76 && \ - echo \${{ secrets.HARBOR_PASSWORD }} | docker login dev.aduanasoft.com -u \${{ secrets.HARBOR_USERNAME }} --password-stdin && \ + 'cd /opt/anexo76 && \ + echo '"'"'${{ secrets.HARBOR_PASSWORD }}'"'"' | docker login dev.aduanasoft.com -u '"'"'${{ secrets.HARBOR_USERNAME }}'"'"' --password-stdin && \ docker compose pull && \ docker compose up -d && \ - docker image prune -f" + docker image prune -f' ssh-agent -k From 8ebaf88f0c7bb3b0570b35da69fa9da08e33e864 Mon Sep 17 00:00:00 2001 From: acazares Date: Thu, 5 Feb 2026 00:11:43 -0600 Subject: [PATCH 4/6] Fix SSH command to accept new host keys during deployment --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 628330a0..9aa2f074 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -63,7 +63,7 @@ jobs: run: | eval $(ssh-agent -s) ssh-add <(echo "${{ secrets.DEV_SERVER_SSH_KEY }}") - ssh -o StrictHostKeyChecking=yes \ + ssh -o StrictHostKeyChecking=accept-new \ ${{ secrets.DEV_SERVER_USER }}@${{ secrets.DEV_SERVER_HOST }} \ 'cd /opt/anexo76 && \ echo '"'"'${{ secrets.HARBOR_PASSWORD }}'"'"' | docker login dev.aduanasoft.com -u '"'"'${{ secrets.HARBOR_USERNAME }}'"'"' --password-stdin && \ From 23cb9b89d0398ee294972166aed4a8f4e31e10f2 Mon Sep 17 00:00:00 2001 From: acazares Date: Thu, 5 Feb 2026 00:13:46 -0600 Subject: [PATCH 5/6] Update deployment path for development server in build workflow --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 9aa2f074..0af0f428 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -65,7 +65,7 @@ jobs: ssh-add <(echo "${{ secrets.DEV_SERVER_SSH_KEY }}") ssh -o StrictHostKeyChecking=accept-new \ ${{ secrets.DEV_SERVER_USER }}@${{ secrets.DEV_SERVER_HOST }} \ - 'cd /opt/anexo76 && \ + 'cd ~/projects/anexo76 && \ echo '"'"'${{ secrets.HARBOR_PASSWORD }}'"'"' | docker login dev.aduanasoft.com -u '"'"'${{ secrets.HARBOR_USERNAME }}'"'"' --password-stdin && \ docker compose pull && \ docker compose up -d && \ From 0d43ea5e0b4b8aa36864b618708a8faa676a997c Mon Sep 17 00:00:00 2001 From: acazares Date: Thu, 5 Feb 2026 00:16:14 -0600 Subject: [PATCH 6/6] Update deployment commands to use production Docker Compose file --- .gitea/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 0af0f428..c03afc92 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -67,7 +67,7 @@ jobs: ${{ secrets.DEV_SERVER_USER }}@${{ secrets.DEV_SERVER_HOST }} \ 'cd ~/projects/anexo76 && \ echo '"'"'${{ secrets.HARBOR_PASSWORD }}'"'"' | docker login dev.aduanasoft.com -u '"'"'${{ secrets.HARBOR_USERNAME }}'"'"' --password-stdin && \ - docker compose pull && \ - docker compose up -d && \ + docker compose -f docker-compose.prod.yml pull && \ + docker compose -f docker-compose.prod.yml up -d && \ docker image prune -f' ssh-agent -k