From ba7b7eb763e9b07031c7330f6d45fca272fe8756 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 16:30:29 +0300 Subject: [PATCH 1/8] chore: fix secrets pipline --- .gitea/workflows/cd-front.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index 81e988d..8d9222d 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -23,11 +23,11 @@ jobs: url: https://vault.d3m0k1d.ru token: ${{ secrets.VAULT }} secrets: | - secret/data/prod/gitea TOKEN | TOKEN ; - secret/data/prod/server SSH_KEY | SSH_KEY ; - secret/data/prod/server USER | USER ; - secret/data/prod/server HOST | HOST ; - secret/data/prod/server PORT | PORT + site/data/prod/gitea TOKEN | GITEA_TOKEN ; + site/data/prod/server SSH_KEY | SSH_KEY ; + site/data/prod/server USER | SERVER_USER ; + site/data/prod/server HOST | SERVER_HOST ; + site/data/prod/server PORT | SERVER_PORT - name: Login to registry uses: docker/login-action@v3 From 01eab6213a67cf1baf875ccf98331aa68556d510 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 16:34:05 +0300 Subject: [PATCH 2/8] chore: add workflow dispatch to cd --- .gitea/workflows/cd-front.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index 8d9222d..5745281 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -4,6 +4,7 @@ on: push: branches: - master + workflow_dispatch: defaults: run: From 521e9bfe0602d372f19156c0ae0e06df884f5888 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 16:40:28 +0300 Subject: [PATCH 3/8] fix: cd vault path --- .gitea/workflows/cd-front.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index 5745281..0fe3bcf 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -17,19 +17,19 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Import Secrets id: import-secrets uses: hashicorp/vault-action@v3.4.0 with: url: https://vault.d3m0k1d.ru - token: ${{ secrets.VAULT }} + token: ${{ secrets.VAULT_TOKEN }} secrets: | - site/data/prod/gitea TOKEN | GITEA_TOKEN ; - site/data/prod/server SSH_KEY | SSH_KEY ; - site/data/prod/server USER | SERVER_USER ; - site/data/prod/server HOST | SERVER_HOST ; - site/data/prod/server PORT | SERVER_PORT - + secrets/site/prod/data/gitea TOKEN | GITEA_TOKEN ; + secrets/site/prod/data/server SSH_KEY | SSH_KEY ; + secrets/site/prod/data/server USER | SERVER_USER ; + secrets/site/prod/data/server HOST | SERVER_HOST ; + secrets/site/prod/data/server PORT | SERVER_PORT - name: Login to registry uses: docker/login-action@v3 with: From 43005c132ccd7499a28f42d522268a97d470c6e1 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 16:42:55 +0300 Subject: [PATCH 4/8] fix: typo --- .gitea/workflows/cd-front.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index 0fe3bcf..2063b1c 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -23,7 +23,7 @@ jobs: uses: hashicorp/vault-action@v3.4.0 with: url: https://vault.d3m0k1d.ru - token: ${{ secrets.VAULT_TOKEN }} + token: ${{ secrets.VAULT }} secrets: | secrets/site/prod/data/gitea TOKEN | GITEA_TOKEN ; secrets/site/prod/data/server SSH_KEY | SSH_KEY ; From b7685b2ab717017db25163cf1cf37ddc20ce8561 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 16:44:53 +0300 Subject: [PATCH 5/8] fix: typo in gitea token --- .gitea/workflows/cd-front.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index 2063b1c..b215a01 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -35,7 +35,7 @@ jobs: with: registry: gitea.d3m0k1d.ru username: d3m0k1d - password: ${{ steps.import-secrets.outputs.TOKEN }} + password: ${{ steps.import-secrets.outputs.GITEA_TOKEN }} - name: Download QEMU uses: docker/setup-qemu-action@v3 From a476eab111369a496992146a1e9bf3bec63e470c Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 16:45:58 +0300 Subject: [PATCH 6/8] fix: names secrets --- .gitea/workflows/cd-front.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index b215a01..d1e1c6b 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -17,7 +17,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Import Secrets id: import-secrets uses: hashicorp/vault-action@v3.4.0 @@ -30,6 +29,7 @@ jobs: secrets/site/prod/data/server USER | SERVER_USER ; secrets/site/prod/data/server HOST | SERVER_HOST ; secrets/site/prod/data/server PORT | SERVER_PORT + - name: Login to registry uses: docker/login-action@v3 with: @@ -56,13 +56,12 @@ jobs: - name: Deploy at server uses: appleboy/ssh-action@v1.2.0 with: - host: ${{ steps.import-secrets.outputs.HOST }} - port: ${{ steps.import-secrets.outputs.PORT }} - username: ${{ steps.import-secrets.outputs.USER }} + host: ${{ steps.import-secrets.outputs.SERVER_HOST }} + port: ${{ steps.import-secrets.outputs.SERVER_PORT }} + username: ${{ steps.import-secrets.outputs.SERVER_USER }} key: ${{ steps.import-secrets.outputs.SSH_KEY }} script: | - docker login -u d3m0k1d -p ${{ steps.import-secrets.outputs.TOKEN }} gitea.d3m0k1d.ru + docker login -u d3m0k1d -p ${{ steps.import-secrets.outputs.GITEA_TOKEN }} gitea.d3m0k1d.ru docker pull gitea.d3m0k1d.ru/d3m0k1d/frontend:latest docker rm -f d3m0k1d-frontend || true docker run --name d3m0k1d-frontend -d -p 80:80 --restart unless-stopped gitea.d3m0k1d.ru/d3m0k1d/frontend:latest - From d5b16a1254ea52dfed9f74f0748f538005004f86 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 17:08:42 +0300 Subject: [PATCH 7/8] simplify cd proccess --- .gitea/workflows/cd-front.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index d1e1c6b..c9f3132 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -30,28 +30,14 @@ jobs: secrets/site/prod/data/server HOST | SERVER_HOST ; secrets/site/prod/data/server PORT | SERVER_PORT + - name: Login to registry - uses: docker/login-action@v3 - with: - registry: gitea.d3m0k1d.ru - username: d3m0k1d - password: ${{ steps.import-secrets.outputs.GITEA_TOKEN }} + run: echo "${{ steps.import-secrets.outputs.GITEA_TOKEN }}" | docker login gitea.d3m0k1d.ru -u d3m0k1d --password-stdin - - name: Download QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: ./frontend - file: ./frontend/Dockerfile - push: true - tags: gitea.d3m0k1d.ru/d3m0k1d/frontend:latest - cache-from: type=gha - cache-to: type=gha,mode=max + run: | + docker build -t gitea.d3m0k1d.ru/d3m0k1d/frontend:latest ./frontend + docker push gitea.d3m0k1d.ru/d3m0k1d/frontend:latest - name: Deploy at server uses: appleboy/ssh-action@v1.2.0 From 251b5abf858f65ac0396b9b5caf74d3269250eb5 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Tue, 3 Feb 2026 17:14:43 +0300 Subject: [PATCH 8/8] fix: cd --- .gitea/workflows/cd-front.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index c9f3132..2def3c4 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -1,15 +1,10 @@ -name: Deploy frontend - +name: Frontend deploy on: push: branches: - master workflow_dispatch: -defaults: - run: - working-directory: frontend - jobs: deploy-frontend: runs-on: ubuntu-latest @@ -30,7 +25,6 @@ jobs: secrets/site/prod/data/server HOST | SERVER_HOST ; secrets/site/prod/data/server PORT | SERVER_PORT - - name: Login to registry run: echo "${{ steps.import-secrets.outputs.GITEA_TOKEN }}" | docker login gitea.d3m0k1d.ru -u d3m0k1d --password-stdin