From e51b7c4ddaabff6695aaab973712b572d775cabb Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 14 Apr 2026 00:17:40 +0300 Subject: [PATCH] =?UTF-8?q?fix(server):=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B6=D0=BA=D0=B0=20docker-compose=20=D0=BD=D0=B0=20Ubun?= =?UTF-8?q?tu=2022.04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- server/install_server.sh | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 405457c..d105f45 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ - `wireguard`, `wireguard-tools` - `iproute2`, `iptables` - `curl`, `ca-certificates`, `openssl`, `qrencode` -- `docker.io`, `docker-compose-plugin` +- `docker.io` и один из пакетов: `docker-compose-plugin` или `docker-compose` (в зависимости от версии ОС/репозиториев) ### Клиент diff --git a/server/install_server.sh b/server/install_server.sh index 8f874da..3bf2314 100755 --- a/server/install_server.sh +++ b/server/install_server.sh @@ -163,7 +163,15 @@ collect_inputs() { install_packages() { apt_install_if_missing \ wireguard wireguard-tools iproute2 iptables curl ca-certificates openssl \ - qrencode docker.io docker-compose-plugin + qrencode docker.io + + if apt-cache show docker-compose-plugin >/dev/null 2>&1; then + apt_install_if_missing docker-compose-plugin + elif apt-cache show docker-compose >/dev/null 2>&1; then + apt_install_if_missing docker-compose + else + log_warn "Не найден пакет docker-compose-plugin/docker-compose. Проверьте репозитории APT." + fi } setup_sysctl() { @@ -294,7 +302,17 @@ services: EOF_COMPOSE systemd_enable_now docker.service - (cd /opt/wireguard-ui && docker compose up -d) + + local compose_cmd=() + if docker compose version >/dev/null 2>&1; then + compose_cmd=(docker compose) + elif command -v docker-compose >/dev/null 2>&1; then + compose_cmd=(docker-compose) + else + die "Не найден docker compose. Установите docker-compose-plugin или docker-compose." + fi + + (cd /opt/wireguard-ui && "${compose_cmd[@]}" up -d) log_success "GUI wireguard-ui запущен" }