From 86c67951da5180c301a2080f4b0a0d0e9cc60daa Mon Sep 17 00:00:00 2001 From: Dmitry Dementev Date: Tue, 4 Aug 2026 16:06:24 -0400 Subject: [PATCH] =?UTF-8?q?fix(site):=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20runner=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=B5=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BE=20Snap=20uv=20=D0=BD=D0=B0=20?= =?UTF-8?q?venv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Зачем: - Snap uv не запускался внутри ограниченного systemd-сервиса без cap_dac_override. - Что: - workflow переведён на системный Python, venv и pinned pip-зависимости. - Snap удалён из PATH runner, а runbook дополнен пакетом python3-venv. - Проверка: - от имени gitea-runner выполнены clone, создание venv, pip install и mkdocs build --strict. - обновлённый systemd unit прошёл systemd-analyze verify и успешно перезапущен. --- .gitea/workflows/deploy-site.yml | 12 +++++++----- project/ops/gitea-vps-site/README.md | 2 +- project/ops/gitea-vps-site/gitea-runner.service | 4 +--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy-site.yml b/.gitea/workflows/deploy-site.yml index adc7f1f..6f5e1b0 100644 --- a/.gitea/workflows/deploy-site.yml +++ b/.gitea/workflows/deploy-site.yml @@ -34,11 +34,13 @@ jobs: run: | set -euo pipefail cd source - uv run \ - --no-project \ - --with 'mkdocs-material==9.6.14' \ - --with 'mkdocs-same-dir==0.1.3' \ - mkdocs build --strict + python3 -m venv .venv + .venv/bin/python -m pip install \ + --disable-pip-version-check \ + --no-input \ + 'mkdocs-material==9.6.14' \ + 'mkdocs-same-dir==0.1.3' + .venv/bin/python -m mkdocs build --strict - name: Publish the complete release atomically env: diff --git a/project/ops/gitea-vps-site/README.md b/project/ops/gitea-vps-site/README.md index 2f020c6..81bd4c0 100644 --- a/project/ops/gitea-vps-site/README.md +++ b/project/ops/gitea-vps-site/README.md @@ -19,7 +19,7 @@ ```bash sudo apt-get update -sudo apt-get install nginx certbot python3-certbot-nginx +sudo apt-get install nginx certbot python3-certbot-nginx python3-venv ``` Создать пользователя и каталоги: diff --git a/project/ops/gitea-vps-site/gitea-runner.service b/project/ops/gitea-vps-site/gitea-runner.service index eb71944..65d9b92 100644 --- a/project/ops/gitea-vps-site/gitea-runner.service +++ b/project/ops/gitea-vps-site/gitea-runner.service @@ -15,9 +15,7 @@ RestartSec=10s TimeoutStopSec=45s KillMode=mixed -Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin" -Environment="UV_CACHE_DIR=/var/lib/gitea-runner/.cache/uv" -Environment="UV_PYTHON_DOWNLOADS=never" +Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" UMask=0022 NoNewPrivileges=true