change cd for front
Some checks failed
CD / build-and-push (push) Failing after 10s
CD / deploy (push) Has been skipped

This commit is contained in:
RM
2026-10-15 02:01:10 +03:00
parent e9204516cf
commit 7ad5361a61
3 changed files with 7 additions and 30 deletions

View File

@@ -37,10 +37,12 @@ jobs:
SSH_PORT: ${{ secrets.SSH_PORT }} SSH_PORT: ${{ secrets.SSH_PORT }}
SSH_USER: ${{ secrets.SSH_USER }} SSH_USER: ${{ secrets.SSH_USER }}
DEPLOY_DIR: ${{ secrets.SSH_DEPLOY_DIR }} DEPLOY_DIR: ${{ secrets.SSH_DEPLOY_DIR }}
COMPOSE_FILE: ${{ secrets.COMPOSE_FILE }}
run: | run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "$SSH_KEY" > ~/.ssh/deploy_key echo "$SSH_KEY" > ~/.ssh/deploy_key
chmod 600 ~/.ssh/deploy_key chmod 600 ~/.ssh/deploy_key
PORT="${SSH_PORT:-22}" PORT="${SSH_PORT:-22}"
FILE="${COMPOSE_FILE:-docker-compose.yml}"
ssh -i ~/.ssh/deploy_key -p "$PORT" -o StrictHostKeyChecking=no -o BatchMode=yes "$SSH_USER@$SSH_HOST" \ ssh -i ~/.ssh/deploy_key -p "$PORT" -o StrictHostKeyChecking=no -o BatchMode=yes "$SSH_USER@$SSH_HOST" \
"cd $DEPLOY_DIR && git pull --ff-only && docker compose pull && sudo -n systemctl stop torgi && sudo -n systemctl start torgi && sudo -n systemctl is-active torgi" "cd $DEPLOY_DIR && git pull --ff-only && docker compose -f \"$FILE\" pull && sudo -n systemctl stop torgi && sudo -n systemctl start torgi && sudo -n systemctl is-active torgi"

View File

@@ -9,7 +9,10 @@ COPY . ./
RUN npm run build RUN npm run build
# Этап 2: раздача статики + прокси API. # Этап 2: раздача статики + прокси API.
# Хост бэкенда задается переменной BACKEND_HOST (шаблон обрабатывается
# entrypoint'ом nginx при старте контейнера).
FROM nginx:1.27-alpine FROM nginx:1.27-alpine
ENV BACKEND_HOST=client-backend
COPY --from=build /app/dist /usr/share/nginx/html COPY --from=build /app/dist /usr/share/nginx/html
COPY nginx.conf /etc/nginx/conf.d/default.conf COPY nginx.conf.template /etc/nginx/templates/default.conf.template
EXPOSE 80 EXPOSE 80

View File

@@ -1,28 +0,0 @@
server {
listen 80;
# API бэкенда (Spring Boot в compose-сервисе client-backend)
location /api/ {
proxy_pass http://client-backend:8181;
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;
}
# Swagger UI бэкенда (удобно на первое время, потом можно закрыть)
location /swagger-ui/ {
proxy_pass http://client-backend:8181;
proxy_set_header Host $host;
}
location /v3/api-docs {
proxy_pass http://client-backend:8181;
proxy_set_header Host $host;
}
# Статика React SPA
location / {
root /usr/share/nginx/html;
try_files $uri /index.html;
}
}