fix(server): поддержка docker-compose на Ubuntu 22.04

This commit is contained in:
Ruslan
2026-04-14 00:17:40 +03:00
parent 16030d8e6c
commit e51b7c4dda
2 changed files with 21 additions and 3 deletions

View File

@@ -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` (в зависимости от версии ОС/репозиториев)
### Клиент

View File

@@ -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 запущен"
}