Fix Ubuntu install: skip Docker if present, wait for apt lock

scripts/deploy.sh

@@ -5,7 +5,12 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "${ROOT_DIR}"
 
 if ! command -v docker &>/dev/null; then
-  echo "Docker не найден. Сначала: sudo ./scripts/install-ubuntu.sh"
+  echo "Docker не найден. Сначала: sudo bash scripts/install-ubuntu.sh"
+  exit 1
+fi
+
+if ! docker compose version &>/dev/null; then
+  echo "Docker Compose plugin не найден."
   exit 1
 fi
 
@@ -25,7 +30,12 @@ docker compose up --build -d
 
 echo ""
 echo "Сервисы запущены."
-echo "  Магазин:  http://$(hostname -I | awk '{print $1}')"
-echo "  Админка:  http://$(hostname -I | awk '{print $1}')/admin/login"
+IP=$(hostname -I | awk '{print $1}')
+echo "  Магазин:  http://${IP}"
+echo "  Админка:  http://${IP}/admin/login"
+if [[ -f .env ]]; then
+  echo "  Логин:    $(grep '^ADMIN_EMAIL=' .env | cut -d= -f2-)"
+  echo "  Пароль:   $(grep '^ADMIN_PASSWORD=' .env | cut -d= -f2-)"
+fi
 echo ""
 echo "Логи: docker compose logs -f"