fix(server): поддержка docker-compose на Ubuntu 22.04
This commit is contained in:
@@ -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` (в зависимости от версии ОС/репозиториев)
|
||||
|
||||
### Клиент
|
||||
|
||||
|
||||
@@ -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 запущен"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user