From 7075091569727b31c3e11b979e34ec43b689d2f0 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Wed, 18 Feb 2026 11:35:18 +1100 Subject: [PATCH] BE: psutil missing Signed-off-by: jokob-sk --- .devcontainer/Dockerfile | 3 ++- Dockerfile | 3 ++- Dockerfile.debian | 3 ++- install/debian12/install_dependencies.debian12.sh | 2 +- install/proxmox/proxmox-install-netalertx.sh | 2 +- install/proxmox/requirements.txt | 3 +-- install/ubuntu24/install.sh | 2 +- install/ubuntu24/requirements.txt | 3 +-- requirements.txt | 1 - 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a7640f26..ba270692 100755 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -35,6 +35,7 @@ RUN apk add --no-cache \ shadow \ python3 \ python3-dev \ + python3-psutil \ gcc \ musl-dev \ libffi-dev \ @@ -136,7 +137,7 @@ ENV LANG=C.UTF-8 RUN apk add --no-cache bash mtr libbsd zip lsblk tzdata curl arp-scan iproute2 iproute2-ss nmap fping \ nmap-scripts traceroute nbtscan net-tools net-snmp-tools bind-tools awake ca-certificates \ - sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 envsubst \ + sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 python3-psutil envsubst \ nginx supercronic shadow su-exec jq && \ rm -Rf /var/cache/apk/* && \ rm -Rf /etc/nginx && \ diff --git a/Dockerfile b/Dockerfile index 0836f7fd..21f9fafc 100755 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ RUN apk add --no-cache \ shadow \ python3 \ python3-dev \ + python3-psutil \ gcc \ musl-dev \ libffi-dev \ @@ -133,7 +134,7 @@ ENV LANG=C.UTF-8 RUN apk add --no-cache bash mtr libbsd zip lsblk tzdata curl arp-scan iproute2 iproute2-ss nmap fping \ nmap-scripts traceroute nbtscan net-tools net-snmp-tools bind-tools awake ca-certificates \ - sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 envsubst \ + sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session python3 python3-psutil envsubst \ nginx supercronic shadow su-exec jq && \ rm -Rf /var/cache/apk/* && \ rm -Rf /etc/nginx && \ diff --git a/Dockerfile.debian b/Dockerfile.debian index da41aad0..4b73d1b3 100755 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python3 \ python3-dev \ python3-pip \ + python3-psutil \ python3-venv \ gcc \ git \ @@ -193,7 +194,7 @@ RUN for vfile in .VERSION .VERSION_PREV; do \ # setcap cap_net_raw,cap_net_admin+eip $(readlink -f ${VIRTUAL_ENV_BIN}/python) && \ /bin/bash /build/init-nginx.sh && \ /bin/bash /build/init-php-fpm.sh && \ - # /bin/bash /build/init-cron.sh && \ + # /bin/bash /build/init-cron.sh && \ # Debian cron init might differ, skipping for now or need to check init-cron.sh content # Checking init-backend.sh /bin/bash /build/init-backend.sh && \ diff --git a/install/debian12/install_dependencies.debian12.sh b/install/debian12/install_dependencies.debian12.sh index 0f0b66d5..276c3095 100755 --- a/install/debian12/install_dependencies.debian12.sh +++ b/install/debian12/install_dependencies.debian12.sh @@ -25,7 +25,7 @@ fi apt-get install -y \ tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo gettext-base \ nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools \ - python3 python3-dev iproute2 nmap fping python3-pip zip usbutils traceroute nbtscan avahi-daemon avahi-utils openrc build-essential git + python3 python3-dev python3-psutil iproute2 nmap fping python3-pip zip usbutils traceroute nbtscan avahi-daemon avahi-utils openrc build-essential git # alternate dependencies sudo apt-get install nginx nginx-core mtr php-fpm php8.2-fpm php-cli php8.2 php8.2-sqlite3 -y diff --git a/install/proxmox/proxmox-install-netalertx.sh b/install/proxmox/proxmox-install-netalertx.sh index da9c5845..351aa19a 100755 --- a/install/proxmox/proxmox-install-netalertx.sh +++ b/install/proxmox/proxmox-install-netalertx.sh @@ -156,7 +156,7 @@ fi apt-get install -y --no-install-recommends \ tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo \ php8.4 php8.4-cgi php8.4-fpm php8.4-sqlite3 php8.4-curl sqlite3 dnsutils net-tools mtr \ - python3 python3-dev iproute2 nmap fping python3-pip zip usbutils traceroute nbtscan \ + python3 python3-dev python3-psutil iproute2 nmap fping python3-pip zip usbutils traceroute nbtscan \ avahi-daemon avahi-utils build-essential git gnupg2 lsb-release \ debian-archive-keyring python3-venv diff --git a/install/proxmox/requirements.txt b/install/proxmox/requirements.txt index 8867f049..fdd30017 100755 --- a/install/proxmox/requirements.txt +++ b/install/proxmox/requirements.txt @@ -22,6 +22,5 @@ python-nmap dnspython librouteros yattag -zeroconf -psutil +zeroconf git+https://github.com/foreign-sub/aiofreepybox.git diff --git a/install/ubuntu24/install.sh b/install/ubuntu24/install.sh index 20eec65f..378f2c23 100755 --- a/install/ubuntu24/install.sh +++ b/install/ubuntu24/install.sh @@ -58,7 +58,7 @@ apt-get install -y --no-install-recommends \ git \ tini ca-certificates curl libwww-perl perl apt-utils cron build-essential \ sqlite3 net-tools \ - python3 python3-venv python3-dev python3-pip + python3 python3-venv python3-dev python3-psutil python3-pip # Install plugin dependencies apt-get install -y --no-install-recommends \ diff --git a/install/ubuntu24/requirements.txt b/install/ubuntu24/requirements.txt index 8867f049..fdd30017 100755 --- a/install/ubuntu24/requirements.txt +++ b/install/ubuntu24/requirements.txt @@ -22,6 +22,5 @@ python-nmap dnspython librouteros yattag -zeroconf -psutil +zeroconf git+https://github.com/foreign-sub/aiofreepybox.git diff --git a/requirements.txt b/requirements.txt index 255aa497..f062388d 100755 --- a/requirements.txt +++ b/requirements.txt @@ -32,5 +32,4 @@ httplib2 gunicorn git+https://github.com/foreign-sub/aiofreepybox.git mcp -psutil pydantic>=2.0,<3.0