Compare commits

...

3 Commits

Author SHA1 Message Date
d145ff537a Merge pull request 'fix: fix db in prod and proxy for backend' (#10) from develop into master
All checks were successful
Backend deploy / deploy-backend (push) Successful in 1m2s
Frontend deploy / deploy-frontend (push) Successful in 1m42s
Reviewed-on: #10
2026-02-14 20:21:34 +00:00
3241413d0d Merge branch 'master' into develop
All checks were successful
Backend ci / build (pull_request) Successful in 3m52s
2026-02-14 20:20:08 +00:00
d3m0k1d
48029ac276 fix: fix db in prod and proxy for backend
All checks were successful
Backend ci / build (pull_request) Successful in 4m7s
2026-02-14 23:18:10 +03:00
3 changed files with 17 additions and 2 deletions

View File

@@ -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 }}" \

View File

@@ -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

View File

@@ -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";