From 48029ac2769bed9f80b4086675166d9585cccda8 Mon Sep 17 00:00:00 2001 From: d3m0k1d Date: Sat, 14 Feb 2026 23:18:01 +0300 Subject: [PATCH] fix: fix db in prod and proxy for backend --- .gitea/workflows/cd-back.yml | 4 ++++ .gitea/workflows/cd-front.yml | 2 +- frontend/nginx.conf | 13 ++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/cd-back.yml b/.gitea/workflows/cd-back.yml index 9b607d3..c271e96 100644 --- a/.gitea/workflows/cd-back.yml +++ b/.gitea/workflows/cd-back.yml @@ -44,10 +44,14 @@ jobs: username: ${{ steps.import-secrets.outputs.SERVER_USER }} key: ${{ steps.import-secrets.outputs.SSH_KEY }} script: | + mkdir -p /opt/d3m0k1d/data docker login -u d3m0k1d -p ${{ steps.import-secrets.outputs.GITEA_TOKEN }} gitea.d3m0k1d.ru docker pull gitea.d3m0k1d.ru/d3m0k1d/backend:latest docker rm -f d3m0k1d-backend || true docker run --name d3m0k1d-backend -d -p 8080:8080 \ + --network d3m0k1d-network \ + -v /opt/d3m0k1d/data:/data \ + -e DB_PATH="/data/d3m0k1d.db" \ -e JWT_SECRET="${{ steps.import-secrets.outputs.JWT_SECRET }}" \ -e GITHUB_CLIENT_ID="${{ steps.import-secrets.outputs.GITHUB_CLIENT_ID }}" \ -e GITHUB_CLIENT_SECRET="${{ steps.import-secrets.outputs.GITHUB_CLIENT_SECRET }}" \ diff --git a/.gitea/workflows/cd-front.yml b/.gitea/workflows/cd-front.yml index 2def3c4..e323e9b 100644 --- a/.gitea/workflows/cd-front.yml +++ b/.gitea/workflows/cd-front.yml @@ -44,4 +44,4 @@ jobs: 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 + docker run --name d3m0k1d-frontend -d -p 80:80 --restart unless-stopped --network d3m0k1d-network gitea.d3m0k1d.ru/d3m0k1d/frontend:latest diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 45327c0..b9cba1f 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -8,8 +8,19 @@ server { location / { try_files $uri $uri/ /index.html; } + location /api/ { + proxy_pass http://d3m0k1d-backend:8080; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + 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; + proxy_cache_bypass $http_upgrade; + } + - # Кэширование статики location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2)$ { expires 1y; add_header Cache-Control "public, immutable";