From a7cc93af09fa055eacf06cbdf5f679f8b294493d Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Thu, 7 Aug 2025 13:34:40 +0200 Subject: [PATCH] Feature: Clean-LXC support now alpine (#6628) --- tools/pve/clean-lxcs.sh | 95 ++++++++++++++++++++++++++--------------- tools/pve/clean.sh | 47 -------------------- 2 files changed, 61 insertions(+), 81 deletions(-) delete mode 100644 tools/pve/clean.sh diff --git a/tools/pve/clean-lxcs.sh b/tools/pve/clean-lxcs.sh index a4a36fd64..7050f3422 100644 --- a/tools/pve/clean-lxcs.sh +++ b/tools/pve/clean-lxcs.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2021-2025 tteck -# Author: tteck (tteckster) +# Copyright (c) 2021-2025 community-scripts ORG # License: MIT # https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE @@ -13,67 +12,95 @@ function header_info() { / / / / _ \/ __ `/ __ \ / / | / / / /___/ / __/ /_/ / / / / / /___/ / /___ \____/_/\___/\__,_/_/ /_/ /_____/_/|_\____/ - EOF } + set -eEuo pipefail -BL=$(echo "\033[36m") -RD=$(echo "\033[01;31m") +BL="\033[36m" +RD="\033[01;31m" CM='\xE2\x9C\x94\033' -GN=$(echo "\033[1;92m") -CL=$(echo "\033[m") +GN="\033[1;92m" +CL="\033[m" + header_info echo "Loading..." -whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE LXC Updater" --yesno "This Will Clean logs, cache and update apt lists on selected LXC Containers. Proceed?" 10 58 + +whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE LXC Updater" --yesno "This will clean logs, cache and update package lists on selected LXC Containers. Proceed?" 10 58 + NODE=$(hostname) EXCLUDE_MENU=() MSG_MAX_LENGTH=0 + while read -r TAG ITEM; do OFFSET=2 ((${#ITEM} + OFFSET > MSG_MAX_LENGTH)) && MSG_MAX_LENGTH=${#ITEM}+OFFSET EXCLUDE_MENU+=("$TAG" "$ITEM " "OFF") done < <(pct list | awk 'NR>1') + excluded_containers=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Containers on $NODE" --checklist "\nSelect containers to skip from cleaning:\n" \ 16 $((MSG_MAX_LENGTH + 23)) 6 "${EXCLUDE_MENU[@]}" 3>&1 1>&2 2>&3 | tr -d '"') if [ $? -ne 0 ]; then exit -fi +fi -function clean_container() { - container=$1 +function run_lxc_clean() { + local container=$1 header_info name=$(pct exec "$container" hostname) - echo -e "${BL}[Info]${GN} Cleaning ${name} ${CL} \n" - pct exec "$container" -- bash -c "apt-get -y --purge autoremove && apt-get -y autoclean && bash <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/pve/clean.sh) && rm -rf /var/lib/apt/lists/* && apt-get update" + + pct exec "$container" -- bash -c ' + BL="\033[36m"; GN="\033[1;92m"; CL="\033[m" + name=$(hostname) + if [ -e /etc/alpine-release ]; then + echo -e "${BL}[Info]${GN} Cleaning $name (Alpine)${CL}\n" + apk cache clean + find /var/log -type f -delete 2>/dev/null + find /tmp -mindepth 1 -delete 2>/dev/null + apk update + else + echo -e "${BL}[Info]${GN} Cleaning $name (Debian/Ubuntu)${CL}\n" + find /var/cache -type f -delete 2>/dev/null + find /var/log -type f -delete 2>/dev/null + find /tmp -mindepth 1 -delete 2>/dev/null + apt-get -y --purge autoremove + apt-get -y autoclean + rm -rf /var/lib/apt/lists/* + apt-get update + fi + ' } + for container in $(pct list | awk '{if(NR>1) print $1}'); do if [[ " ${excluded_containers[@]} " =~ " $container " ]]; then header_info echo -e "${BL}[Info]${GN} Skipping ${BL}$container${CL}" sleep 1 - else - os=$(pct config "$container" | awk '/^ostype/ {print $2}') - if [ "$os" != "debian" ] && [ "$os" != "ubuntu" ]; then - header_info - echo -e "${BL}[Info]${GN} Skipping ${name} ${RD}$container is not Debian or Ubuntu ${CL} \n" - sleep 1 - continue - fi + continue + fi - status=$(pct status "$container") - template=$(pct config "$container" | grep -q "template:" && echo "true" || echo "false") - if [ "$template" == "false" ] && [ "$status" == "status: stopped" ]; then - echo -e "${BL}[Info]${GN} Starting${BL} $container ${CL} \n" - pct start "$container" - echo -e "${BL}[Info]${GN} Waiting For${BL} $container${CL}${GN} To Start ${CL} \n" - sleep 5 - clean_container "$container" - echo -e "${BL}[Info]${GN} Shutting down${BL} $container ${CL} \n" - pct shutdown "$container" & - elif [ "$status" == "status: running" ]; then - clean_container "$container" - fi + os=$(pct config "$container" | awk '/^ostype/ {print $2}') + # Supported: debian, ubuntu, alpine + if [ "$os" != "debian" ] && [ "$os" != "ubuntu" ] && [ "$os" != "alpine" ]; then + header_info + echo -e "${BL}[Info]${GN} Skipping ${RD}$container is not Debian, Ubuntu or Alpine${CL} \n" + sleep 1 + continue + fi + + status=$(pct status "$container") + template=$(pct config "$container" | grep -q "template:" && echo "true" || echo "false") + + if [ "$template" == "false" ] && [ "$status" == "status: stopped" ]; then + echo -e "${BL}[Info]${GN} Starting${BL} $container ${CL} \n" + pct start "$container" + echo -e "${BL}[Info]${GN} Waiting For${BL} $container${CL}${GN} To Start ${CL} \n" + sleep 5 + run_lxc_clean "$container" + echo -e "${BL}[Info]${GN} Shutting down${BL} $container ${CL} \n" + pct shutdown "$container" & + elif [ "$status" == "status: running" ]; then + run_lxc_clean "$container" fi done diff --git a/tools/pve/clean.sh b/tools/pve/clean.sh deleted file mode 100644 index 1c92d79ec..000000000 --- a/tools/pve/clean.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021-2025 tteck -# Author: tteck (tteckster) -# License: MIT -# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE - -function header_info() { - clear - cat <<"EOF" - ________ __ _ ________ - / ____/ /__ ____ _____ / / | |/ / ____/ - / / / / _ \/ __ `/ __ \ / / | / / -/ /___/ / __/ /_/ / / / / / /___/ / /___ -\____/_/\___/\__,_/_/ /_/ /_____/_/|_\____/ - -EOF -} -BL=$(echo "\033[36m") -GN=$(echo "\033[1;92m") -CL=$(echo "\033[m") -name=$(hostname) -header_info -echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n" -cache=$(find /var/cache/ -type f) -if [[ -z "$cache" ]]; then - echo -e "It appears there are no cached files on your system. \n" - sleep 2 -else - find /var/cache -type f -delete - echo "Successfully Removed Cache" - sleep 2 -fi -header_info -echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n" -logs=$(find /var/log/ -type f) -if [[ -z "$logs" ]]; then - echo -e "It appears there are no logs on your system. \n" - sleep 2 -else - find /var/log -type f -delete - echo "Successfully Removed Logs" - sleep 2 -fi -header_info -echo -e "${BL}[Info]${GN} Cleaning $name${CL} \n" -echo -e "${GN}Populating apt lists${CL} \n"