Fix docker discovery with sudo fallback
This commit is contained in:
@@ -2,7 +2,7 @@ import json
|
||||
from aiogram import F
|
||||
from aiogram.types import CallbackQuery, InlineKeyboardMarkup, InlineKeyboardButton
|
||||
from app import dp, ADMIN_ID
|
||||
from services.runner import run_cmd
|
||||
from services.docker import docker_cmd
|
||||
from state import DOCKER_MAP
|
||||
from handlers.backup import cmd_backup_status
|
||||
|
||||
@@ -17,7 +17,7 @@ async def docker_callback(cb: CallbackQuery):
|
||||
|
||||
if action == "restart":
|
||||
await cb.answer("Restarting…")
|
||||
rc, out = await run_cmd(["sudo", "docker", "restart", real])
|
||||
rc, out = await docker_cmd(["restart", real])
|
||||
|
||||
await cb.message.answer(
|
||||
f"🔄 **{alias} restarted**\n```{out}```",
|
||||
@@ -26,9 +26,7 @@ async def docker_callback(cb: CallbackQuery):
|
||||
|
||||
elif action == "logs":
|
||||
await cb.answer("Loading logs…")
|
||||
rc, out = await run_cmd(
|
||||
["sudo", "docker", "logs", "--tail", "80", real]
|
||||
)
|
||||
rc, out = await docker_cmd(["logs", "--tail", "80", real])
|
||||
|
||||
await cb.message.answer(
|
||||
f"📜 **Logs: {alias}**\n```{out}```",
|
||||
|
||||
@@ -3,8 +3,7 @@ from aiogram.types import Message
|
||||
from app import dp
|
||||
from auth import is_admin_msg
|
||||
from keyboards import docker_kb, docker_inline_kb
|
||||
from services.docker import container_uptime
|
||||
from services.runner import run_cmd
|
||||
from services.docker import container_uptime, docker_cmd
|
||||
from state import DOCKER_MAP
|
||||
|
||||
|
||||
@@ -21,12 +20,8 @@ async def cmd_docker_status(msg: Message):
|
||||
lines = ["🐳 Docker containers\n"]
|
||||
|
||||
for alias, real in DOCKER_MAP.items():
|
||||
rc, raw = await run_cmd(
|
||||
[
|
||||
"sudo", "docker", "inspect",
|
||||
"-f", "{{.State.Status}}|{{.State.StartedAt}}",
|
||||
real
|
||||
],
|
||||
rc, raw = await docker_cmd(
|
||||
["inspect", "-f", "{{.State.Status}}|{{.State.StartedAt}}", real],
|
||||
timeout=10,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user