From fa9e9fe4fe2e40133c4440ca7528111152c602a0 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 09:56:22 +0100 Subject: [PATCH 01/14] Refactor Docker VM script and modularize header Refactored vm/docker-vm.sh for improved modularity, maintainability, and clarity. Moved ASCII header to a new vm/headers/docker-vm file, streamlined variable and function organization, and enhanced script structure for Docker VM creation with optional Portainer support. Improved error handling, storage selection, and image customization logic. --- vm/docker-vm.sh | 755 ++++++++++++++++--------------------------- vm/headers/docker-vm | 6 + 2 files changed, 277 insertions(+), 484 deletions(-) create mode 100644 vm/headers/docker-vm diff --git a/vm/docker-vm.sh b/vm/docker-vm.sh index 9d77ebd6a..a85a74301 100644 --- a/vm/docker-vm.sh +++ b/vm/docker-vm.sh @@ -1,77 +1,46 @@ #!/usr/bin/env bash # Copyright (c) 2021-2025 community-scripts ORG -# Author: thost96 (thost96) | Co-Author: michelroegl-brunner -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE +# Author: thost96 (thost96) | Co-Author: michelroegl-brunner | Refactored: MickLesk +# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE -source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/api.func) -# Load Cloud-Init library for VM configuration -source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/cloud-init.sh) 2>/dev/null || true +# ============================================================================== +# Docker VM - Creates a Docker-ready Virtual Machine with optional Portainer +# ============================================================================== -function header_info() { - clear - cat <<"EOF" - ____ __ _ ____ ___ - / __ \____ _____/ /_____ _____ | | / / |/ / - / / / / __ \/ ___/ //_/ _ \/ ___/ | | / / /|_/ / - / /_/ / /_/ / /__/ ,< / __/ / | |/ / / / / -/_____/\____/\___/_/|_|\___/_/ |___/_/ /_/ +source /dev/stdin <<<$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/api.func) +source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/vm-core.func) +source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/cloud-init.func) 2>/dev/null || true +load_functions -EOF -} -header_info -echo -e "\n Loading..." -GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//') -RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)" -METHOD="" +# ============================================================================== +# SCRIPT VARIABLES +# ============================================================================== +APP="Docker" +APP_TYPE="vm" NSAPP="docker-vm" var_os="debian" var_version="13" + +GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//') +RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)" +METHOD="" DISK_SIZE="10G" USE_CLOUD_INIT="no" INSTALL_PORTAINER="no" OS_TYPE="" OS_VERSION="" - -YW=$(echo "\033[33m") -BL=$(echo "\033[36m") -RD=$(echo "\033[01;31m") -BGN=$(echo "\033[4;92m") -GN=$(echo "\033[1;92m") -DGN=$(echo "\033[32m") -CL=$(echo "\033[m") - -CL=$(echo "\033[m") -BOLD=$(echo "\033[1m") -BFR="\\r\\033[K" -HOLD=" " -TAB=" " - -CM="${TAB}βœ”οΈ${TAB}${CL}" -CROSS="${TAB}βœ–οΈ${TAB}${CL}" -INFO="${TAB}πŸ’‘${TAB}${CL}" -OS="${TAB}πŸ–₯️${TAB}${CL}" -CONTAINERTYPE="${TAB}πŸ“¦${TAB}${CL}" -DISKSIZE="${TAB}πŸ’Ύ${TAB}${CL}" -CPUCORE="${TAB}🧠${TAB}${CL}" -RAMSIZE="${TAB}πŸ› οΈ${TAB}${CL}" -CONTAINERID="${TAB}πŸ†”${TAB}${CL}" -HOSTNAME="${TAB}🏠${TAB}${CL}" -BRIDGE="${TAB}πŸŒ‰${TAB}${CL}" -GATEWAY="${TAB}🌐${TAB}${CL}" -DEFAULT="${TAB}βš™οΈ${TAB}${CL}" -MACADDRESS="${TAB}πŸ”—${TAB}${CL}" -VLANTAG="${TAB}🏷️${TAB}${CL}" -CREATING="${TAB}πŸš€${TAB}${CL}" -ADVANCED="${TAB}🧩${TAB}${CL}" -CLOUD="${TAB}☁️${TAB}${CL}" - THIN="discard=on,ssd=1," + +# ============================================================================== +# ERROR HANDLING & CLEANUP +# ============================================================================== set -e trap 'error_handler $LINENO "$BASH_COMMAND"' ERR trap cleanup EXIT trap 'post_update_to_api "failed" "INTERRUPTED"' SIGINT trap 'post_update_to_api "failed" "TERMINATED"' SIGTERM + function error_handler() { local exit_code="$?" local line_number="$1" @@ -82,149 +51,9 @@ function error_handler() { cleanup_vmid } -function get_valid_nextid() { - local try_id - try_id=$(pvesh get /cluster/nextid) - while true; do - if [ -f "/etc/pve/qemu-server/${try_id}.conf" ] || [ -f "/etc/pve/lxc/${try_id}.conf" ]; then - try_id=$((try_id + 1)) - continue - fi - if lvs --noheadings -o lv_name | grep -qE "(^|[-_])${try_id}($|[-_])"; then - try_id=$((try_id + 1)) - continue - fi - break - done - echo "$try_id" -} - -function cleanup_vmid() { - if qm status $VMID &>/dev/null; then - qm stop $VMID &>/dev/null - qm destroy $VMID &>/dev/null - fi -} - -function cleanup() { - popd >/dev/null - post_update_to_api "done" "none" - rm -rf $TEMP_DIR -} - -TEMP_DIR=$(mktemp -d) -pushd $TEMP_DIR >/dev/null -if whiptail --backtitle "Proxmox VE Helper Scripts" --title "Docker VM" --yesno "This will create a New Docker VM. Proceed?" 10 58; then - : -else - header_info && echo -e "${CROSS}${RD}User exited script${CL}\n" && exit -fi - -function msg_info() { - local msg="$1" - echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}" -} - -function msg_ok() { - local msg="$1" - echo -e "${BFR}${CM}${GN}${msg}${CL}" -} - -function msg_error() { - local msg="$1" - echo -e "${BFR}${CROSS}${RD}${msg}${CL}" -} - -function spinner() { - local pid=$1 - local msg="$2" - local spin='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏' - local i=0 - - echo -ne "${TAB}${YW}${msg} " - while kill -0 $pid 2>/dev/null; do - i=$(((i + 1) % 10)) - echo -ne "\b${spin:$i:1}" - sleep 0.1 - done - echo -ne "\b" -} - -function check_root() { - if [[ "$(id -u)" -ne 0 || $(ps -o comm= -p $PPID) == "sudo" ]]; then - clear - msg_error "Please run this script as root." - echo -e "\nExiting..." - sleep 2 - exit - fi -} - -# This function checks the version of Proxmox Virtual Environment (PVE) and exits if the version is not supported. -# Supported: Proxmox VE 8.0.x – 8.9.x and 9.0 – 9.1 -pve_check() { - local PVE_VER - PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')" - - # Check for Proxmox VE 8.x: allow 8.0–8.9 - if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then - local MINOR="${BASH_REMATCH[1]}" - if ((MINOR < 0 || MINOR > 9)); then - msg_error "This version of Proxmox VE is not supported." - msg_error "Supported: Proxmox VE version 8.0 – 8.9" - exit 1 - fi - PVE_MAJOR=8 - return 0 - fi - - # Check for Proxmox VE 9.x: allow 9.0–9.1 - if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then - local MINOR="${BASH_REMATCH[1]}" - if ((MINOR < 0 || MINOR > 1)); then - msg_error "This version of Proxmox VE is not yet supported." - msg_error "Supported: Proxmox VE version 9.0 – 9.1" - exit 1 - fi - PVE_MAJOR=9 - return 0 - fi - - # All other unsupported versions - msg_error "This version of Proxmox VE is not supported." - msg_error "Supported versions: Proxmox VE 8.0 – 8.x or 9.0 – 9.1" - exit 1 -} - -function arch_check() { - if [ "$(dpkg --print-architecture)" != "amd64" ]; then - echo -e "\n ${INFO}${YWB}This script will not work with PiMox! \n" - echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n" - echo -e "Exiting..." - sleep 2 - exit - fi -} - -function ssh_check() { - if command -v pveversion >/dev/null 2>&1; then - if [ -n "${SSH_CLIENT:+x}" ]; then - if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then - echo "you've been warned" - else - clear - exit - fi - fi - fi -} - -function exit-script() { - clear - echo -e "\n${CROSS}${RD}User exited script${CL}\n" - exit -} - +# ============================================================================== +# OS SELECTION FUNCTIONS +# ============================================================================== function select_os() { if OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \ "Choose Operating System for Docker VM" 14 68 4 \ @@ -261,7 +90,7 @@ function select_os() { esac echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}${OS_DISPLAY}${CL}" else - exit-script + exit_script fi } @@ -269,7 +98,7 @@ function select_cloud_init() { # Ubuntu only has cloudimg variant (always Cloud-Init), so no choice needed if [ "$OS_TYPE" = "ubuntu" ]; then USE_CLOUD_INIT="yes" - echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}yes (Ubuntu requires Cloud-Init)${CL}" + echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes (Ubuntu requires Cloud-Init)${CL}" return fi @@ -277,10 +106,10 @@ function select_cloud_init() { if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "CLOUD-INIT" \ --yesno "Enable Cloud-Init for VM configuration?\n\nCloud-Init allows automatic configuration of:\n- User accounts and passwords\n- SSH keys\n- Network settings (DHCP/Static)\n- DNS configuration\n\nYou can also configure these settings later in Proxmox UI.\n\nNote: Debian without Cloud-Init will use nocloud image with console auto-login." 18 68); then USE_CLOUD_INIT="yes" - echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}" + echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}" else USE_CLOUD_INIT="no" - echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}" + echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}" fi } @@ -299,9 +128,6 @@ function get_image_url() { local arch=$(dpkg --print-architecture) case $OS_TYPE in debian) - # Debian has two variants: - # - generic: For Cloud-Init enabled VMs - # - nocloud: For VMs without Cloud-Init (has console auto-login) if [ "$USE_CLOUD_INIT" = "yes" ]; then echo "https://cloud.debian.org/images/cloud/${OS_CODENAME}/latest/debian-${OS_VERSION}-generic-${arch}.qcow2" else @@ -309,23 +135,21 @@ function get_image_url() { fi ;; ubuntu) - # Ubuntu only has cloudimg variant (always with Cloud-Init support) echo "https://cloud-images.ubuntu.com/${OS_CODENAME}/current/${OS_CODENAME}-server-cloudimg-${arch}.img" ;; esac } +# ============================================================================== +# SETTINGS FUNCTIONS +# ============================================================================== function default_settings() { # OS Selection - ALWAYS ask select_os - - # Cloud-Init Selection - ALWAYS ask select_cloud_init - - # Portainer Selection - ALWAYS ask select_portainer - # Set defaults for other settings + # Set defaults VMID=$(get_valid_nextid) FORMAT="" MACHINE=" -machine q35" @@ -360,17 +184,15 @@ function default_settings() { } function advanced_settings() { - # OS Selection - ALWAYS ask (at the beginning) + # OS Selection - ALWAYS ask first select_os - - # Cloud-Init Selection - ALWAYS ask (at the beginning) select_cloud_init - - # Portainer Selection - ALWAYS ask (at the beginning) select_portainer METHOD="advanced" [ -z "${VMID:-}" ] && VMID=$(get_valid_nextid) + + # VM ID while true; do if VMID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Virtual Machine ID" 8 58 $VMID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z "$VMID" ]; then @@ -384,10 +206,11 @@ function advanced_settings() { echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}$VMID${CL}" break else - exit-script + exit_script fi done + # Machine Type if MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \ "q35" "Q35 (Modern, PCIe)" ON \ "i440fx" "i440fx (Legacy, PCI)" OFF \ @@ -402,9 +225,10 @@ function advanced_settings() { MACHINE="" fi else - exit-script + exit_script fi + # Disk Size if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GiB (e.g., 10, 20)" 8 58 "$DISK_SIZE" --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then DISK_SIZE=$(echo "$DISK_SIZE" | tr -d ' ') if [[ "$DISK_SIZE" =~ ^[0-9]+$ ]]; then @@ -414,12 +238,13 @@ function advanced_settings() { echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}" else echo -e "${DISKSIZE}${BOLD}${RD}Invalid Disk Size. Please use a number (e.g., 10 or 10G).${CL}" - exit-script + exit_script fi else - exit-script + exit_script fi + # Disk Cache if DISK_CACHE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \ "0" "None (Default)" ON \ "1" "Write Through" OFF \ @@ -432,21 +257,22 @@ function advanced_settings() { DISK_CACHE="" fi else - exit-script + exit_script fi + # Hostname if VM_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 docker --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $VM_NAME ]; then HN="docker" - echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}" else HN=$(echo ${VM_NAME,,} | tr -d ' ') - echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}" fi + echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}" else - exit-script + exit_script fi + # CPU Model if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \ "1" "Host (Recommended)" ON \ "0" "KVM64" OFF \ @@ -459,80 +285,78 @@ function advanced_settings() { CPU_TYPE="" fi else - exit-script + exit_script fi + # CPU Cores if CORE_COUNT=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $CORE_COUNT ]; then CORE_COUNT="2" - echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}" - else - echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}" fi + echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}" else - exit-script + exit_script fi - if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 2048 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + # RAM Size + if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 4096 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $RAM_SIZE ]; then - RAM_SIZE="2048" - echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}" - else - echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}" + RAM_SIZE="4096" fi + echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}" else - exit-script + exit_script fi + # Bridge if BRG=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $BRG ]; then BRG="vmbr0" - echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}" - else - echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}" fi + echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}" else - exit-script + exit_script fi + # MAC Address if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $MAC1 ]; then MAC="$GEN_MAC" - echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}" else MAC="$MAC1" - echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC1${CL}" fi + echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}" else - exit-script + exit_script fi - if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + # VLAN + if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan (leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $VLAN1 ]; then VLAN1="Default" VLAN="" - echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}" else VLAN=",tag=$VLAN1" - echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}" fi + echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}" else - exit-script + exit_script fi + # MTU if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $MTU1 ]; then MTU1="Default" MTU="" - echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}" else MTU=",mtu=$MTU1" - echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}" fi + echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}" else - exit-script + exit_script fi + # Start VM if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}" START_VM="yes" @@ -541,6 +365,7 @@ function advanced_settings() { START_VM="no" fi + # Confirm if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create a Docker VM?" --no-button Do-Over 10 58); then echo -e "${CREATING}${BOLD}${DGN}Creating a Docker VM using the above advanced settings${CL}" else @@ -561,13 +386,163 @@ function start_script() { advanced_settings fi } + +# ============================================================================== +# DOCKER INSTALLATION SCRIPTS +# ============================================================================== +function create_docker_install_script() { + local file="$1" + local with_portainer="$2" + + local portainer_section="" + if [ "$with_portainer" = "yes" ]; then + portainer_section=' +# Install Portainer +/root/portainer-install.sh' + else + portainer_section=' +# Portainer not requested - skip installation' + fi + + virt-customize -q -a "${file}" --run-command "cat > /root/install-docker.sh << 'INSTALLEOF' +#!/bin/bash +# Log output to file +exec > /var/log/install-docker.log 2>&1 +echo \"[\$(date)] Starting Docker installation on first boot\" + +# Check if Docker is already installed +if command -v docker >/dev/null 2>&1; then + echo \"[\$(date)] Docker already installed, checking if running\" + systemctl start docker 2>/dev/null || true + if docker info >/dev/null 2>&1; then + echo \"[\$(date)] Docker is already working, exiting\" + exit 0 + fi +fi + +# Wait for network to be fully available +for i in {1..30}; do + if ping -c 1 8.8.8.8 >/dev/null 2>&1; then + echo \"[\$(date)] Network is available\" + break + fi + echo \"[\$(date)] Waiting for network... attempt \$i/30\" + sleep 2 +done + +# Configure DNS +echo \"[\$(date)] Configuring DNS\" +mkdir -p /etc/systemd/resolved.conf.d +cat > /etc/systemd/resolved.conf.d/dns.conf << DNSEOF +[Resolve] +DNS=8.8.8.8 1.1.1.1 +FallbackDNS=8.8.4.4 1.0.0.1 +DNSEOF +systemctl restart systemd-resolved 2>/dev/null || true + +# Update package lists +echo \"[\$(date)] Updating package lists\" +apt-get update + +# Install base packages if not already installed +echo \"[\$(date)] Installing base packages\" +apt-get install -y qemu-guest-agent curl ca-certificates 2>/dev/null || true + +# Install Docker +echo \"[\$(date)] Installing Docker\" +curl -fsSL https://get.docker.com | sh +systemctl enable docker +systemctl start docker + +# Wait for Docker to be ready +for i in {1..10}; do + if docker info >/dev/null 2>&1; then + echo \"[\$(date)] Docker is ready\" + break + fi + sleep 1 +done +${portainer_section} + +# Create completion flag +echo \"[\$(date)] Docker installation completed successfully\" +touch /root/.docker-installed +INSTALLEOF" >/dev/null + + virt-customize -q -a "${file}" --run-command "chmod +x /root/install-docker.sh" >/dev/null +} + +function create_portainer_script() { + local file="$1" + + virt-customize -q -a "${file}" --run-command 'cat > /root/portainer-install.sh << '"'"'PORTAINEREOF'"'"' +#!/bin/bash +exec >> /var/log/install-docker.log 2>&1 +echo "[$(date)] Installing Portainer" +docker volume create portainer_data 2>/dev/null || true +docker run -d \ + -p 9000:9000 \ + -p 9443:9443 \ + --name=portainer \ + --restart=always \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v portainer_data:/data \ + portainer/portainer-ce:latest +echo "[$(date)] Portainer installed" +PORTAINEREOF' >/dev/null + + virt-customize -q -a "${file}" --run-command 'chmod +x /root/portainer-install.sh' >/dev/null +} + +function create_docker_service() { + local file="$1" + + virt-customize -q -a "${file}" --run-command 'cat > /etc/systemd/system/install-docker.service << "SERVICEEOF" +[Unit] +Description=Install Docker on First Boot +After=network-online.target +Wants=network-online.target +ConditionPathExists=!/root/.docker-installed + +[Service] +Type=oneshot +ExecStart=/root/install-docker.sh +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target +SERVICEEOF +' >/dev/null + + virt-customize -q -a "${file}" --run-command "systemctl enable install-docker.service" >/dev/null +} + +# ============================================================================== +# MAIN EXECUTION +# ============================================================================== +header_info +echo -e "\n Loading..." + check_root arch_check pve_check ssh_check + +TEMP_DIR=$(mktemp -d) +pushd $TEMP_DIR >/dev/null + +if whiptail --backtitle "Proxmox VE Helper Scripts" --title "Docker VM" --yesno "This will create a New Docker VM. Proceed?" 10 58; then + : +else + header_info && echo -e "${CROSS}${RD}User exited script${CL}\n" && exit +fi + start_script post_to_api_vm +# ============================================================================== +# STORAGE SELECTION +# ============================================================================== msg_info "Validating Storage" while read -r line; do TAG=$(echo $line | awk '{print $1}') @@ -580,6 +555,7 @@ while read -r line; do fi STORAGE_MENU+=("$TAG" "$ITEM" "OFF") done < <(pvesm status -content images | awk 'NR>1') + VALID=$(pvesm status -content images | awk 'NR>1') if [ -z "$VALID" ]; then msg_error "Unable to detect a valid storage location." @@ -597,15 +573,20 @@ fi msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location." msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}." +# ============================================================================== +# PREREQUISITES +# ============================================================================== if ! command -v virt-customize &>/dev/null; then - msg_info "Installing Pre-Requisite libguestfs-tools onto Host" + msg_info "Installing libguestfs-tools" apt-get -qq update >/dev/null apt-get -qq install libguestfs-tools lsb-release -y >/dev/null - # Workaround for Proxmox VE 9.0 libguestfs issue apt-get -qq install dhcpcd-base -y >/dev/null 2>&1 || true - msg_ok "Installed libguestfs-tools successfully" + msg_ok "Installed libguestfs-tools" fi +# ============================================================================== +# IMAGE DOWNLOAD +# ============================================================================== msg_info "Retrieving the URL for the ${OS_DISPLAY} Qcow2 Disk Image" URL=$(get_image_url) sleep 2 @@ -615,6 +596,9 @@ echo -en "\e[1A\e[0K" FILE=$(basename $URL) msg_ok "Downloaded ${CL}${BL}${FILE}${CL}" +# ============================================================================== +# STORAGE TYPE DETECTION +# ============================================================================== STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}') case $STORAGE_TYPE in nfs | dir) @@ -631,197 +615,31 @@ btrfs) THIN="" ;; esac + for i in {0,1}; do disk="DISK$i" eval DISK${i}=vm-${VMID}-disk-${i}${DISK_EXT:-} eval DISK${i}_REF=${STORAGE}:${DISK_REF:-}${!disk} done +# ============================================================================== +# IMAGE CUSTOMIZATION +# ============================================================================== echo -e "${INFO}${BOLD}${GN}Preparing ${OS_DISPLAY} Qcow2 Disk Image${CL}" -# Set DNS for libguestfs appliance environment (not the guest) export LIBGUESTFS_BACKEND_SETTINGS=dns=8.8.8.8,1.1.1.1 -# Create install-docker.sh with Portainer support if requested +# Create Docker installation scripts +create_docker_install_script "${FILE}" "$INSTALL_PORTAINER" + if [ "$INSTALL_PORTAINER" = "yes" ]; then - virt-customize -q -a "${FILE}" --run-command "cat > /root/install-docker.sh << \"INSTALLEOF\" -#!/bin/bash -# Log output to file -exec > /var/log/install-docker.log 2>&1 -echo \"[\\$(date)] Starting Docker installation on first boot\" - -# Check if Docker is already installed -if command -v docker >/dev/null 2>&1; then - echo \"[\\$(date)] Docker already installed, checking if running\" - systemctl start docker 2>/dev/null || true - if docker info >/dev/null 2>&1; then - echo \"[\\$(date)] Docker is already working, exiting\" - exit 0 - fi + create_portainer_script "${FILE}" fi -# Wait for network to be fully available -for i in {1..30}; do - if ping -c 1 8.8.8.8 >/dev/null 2>&1; then - echo \"[\\$(date)] Network is available\" - break - fi - echo \"[\\$(date)] Waiting for network... attempt \\\$i/30\" - sleep 2 -done +create_docker_service "${FILE}" -# Configure DNS -echo \"[\\$(date)] Configuring DNS\" -mkdir -p /etc/systemd/resolved.conf.d -cat > /etc/systemd/resolved.conf.d/dns.conf << DNSEOF -[Resolve] -DNS=8.8.8.8 1.1.1.1 -FallbackDNS=8.8.4.4 1.0.0.1 -DNSEOF -systemctl restart systemd-resolved 2>/dev/null || true - -# Update package lists -echo \"[\\$(date)] Updating package lists\" -apt-get update - -# Install base packages if not already installed -echo \"[\\$(date)] Installing base packages\" -apt-get install -y qemu-guest-agent curl ca-certificates 2>/dev/null || true - -# Install Docker -echo \"[\\$(date)] Installing Docker\" -curl -fsSL https://get.docker.com | sh -systemctl enable docker -systemctl start docker - -# Wait for Docker to be ready -for i in {1..10}; do - if docker info >/dev/null 2>&1; then - echo \"[\\$(date)] Docker is ready\" - break - fi - sleep 1 -done - -# Install Portainer -/root/portainer-install.sh - -# Create completion flag -echo \"[\\$(date)] Docker installation completed successfully\" -touch /root/.docker-installed -INSTALLEOF" >/dev/null -else - virt-customize -q -a "${FILE}" --run-command "cat > /root/install-docker.sh << \"INSTALLEOF\" -#!/bin/bash -# Log output to file -exec > /var/log/install-docker.log 2>&1 -echo \"[\\$(date)] Starting Docker installation on first boot\" - -# Check if Docker is already installed -if command -v docker >/dev/null 2>&1; then - echo \"[\\$(date)] Docker already installed, checking if running\" - systemctl start docker 2>/dev/null || true - if docker info >/dev/null 2>&1; then - echo \"[\\$(date)] Docker is already working, exiting\" - exit 0 - fi -fi - -# Wait for network to be fully available -for i in {1..30}; do - if ping -c 1 8.8.8.8 >/dev/null 2>&1; then - echo \"[\\$(date)] Network is available\" - break - fi - echo \"[\\$(date)] Waiting for network... attempt \\\$i/30\" - sleep 2 -done - -# Configure DNS -echo \"[\\$(date)] Configuring DNS\" -mkdir -p /etc/systemd/resolved.conf.d -cat > /etc/systemd/resolved.conf.d/dns.conf << DNSEOF -[Resolve] -DNS=8.8.8.8 1.1.1.1 -FallbackDNS=8.8.4.4 1.0.0.1 -DNSEOF -systemctl restart systemd-resolved 2>/dev/null || true - -# Update package lists -echo \"[\\$(date)] Updating package lists\" -apt-get update - -# Install base packages if not already installed -echo \"[\\$(date)] Installing base packages\" -apt-get install -y qemu-guest-agent curl ca-certificates 2>/dev/null || true - -# Install Docker -echo \"[\\$(date)] Installing Docker\" -curl -fsSL https://get.docker.com | sh -systemctl enable docker -systemctl start docker - -# Wait for Docker to be ready -for i in {1..10}; do - if docker info >/dev/null 2>&1; then - echo \"[\\$(date)] Docker is ready\" - break - fi - sleep 1 -done - -# Portainer not requested - skip installation - -# Create completion flag -echo \"[\\$(date)] Docker installation completed successfully\" -touch /root/.docker-installed -INSTALLEOF" >/dev/null -fi - -# Add Portainer installation script if requested -if [ "$INSTALL_PORTAINER" = "yes" ]; then - virt-customize -q -a "${FILE}" --run-command 'cat > /root/portainer-install.sh << '"'"'PORTAINEREOF'"'"' -#!/bin/bash -exec >> /var/log/install-docker.log 2>&1 -echo "[$(date)] Installing Portainer" -docker volume create portainer_data 2>/dev/null || true -docker run -d \ - -p 9000:9000 \ - -p 9443:9443 \ - --name=portainer \ - --restart=always \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v portainer_data:/data \ - portainer/portainer-ce:latest -echo "[$(date)] Portainer installed" -PORTAINEREOF' >/dev/null - - virt-customize -q -a "${FILE}" --run-command 'chmod +x /root/portainer-install.sh' >/dev/null -fi - -virt-customize -q -a "${FILE}" --run-command "chmod +x /root/install-docker.sh" >/dev/null - -virt-customize -q -a "${FILE}" --run-command 'cat > /etc/systemd/system/install-docker.service << "SERVICEEOF" -[Unit] -Description=Install Docker on First Boot -After=network-online.target -Wants=network-online.target -ConditionPathExists=!/root/.docker-installed - -[Service] -Type=oneshot -ExecStart=/root/install-docker.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target -SERVICEEOF -' >/dev/null - -virt-customize -q -a "${FILE}" --run-command "systemctl enable install-docker.service" >/dev/null - -# Try to install packages and Docker during image customization -DOCKER_INSTALLED_ON_FIRST_BOOT="yes" # Assume first-boot by default +# Try to install packages during image customization +DOCKER_INSTALLED_ON_FIRST_BOOT="yes" msg_info "Installing base packages (qemu-guest-agent, curl, ca-certificates)" if virt-customize -a "${FILE}" --install qemu-guest-agent,curl,ca-certificates >/dev/null 2>&1; then @@ -845,15 +663,13 @@ if virt-customize -a "${FILE}" --install qemu-guest-agent,curl,ca-certificates > } DOCKEREOF" >/dev/null 2>&1 - # Create completion flag to prevent first-boot script from running virt-customize -q -a "${FILE}" --run-command "touch /root/.docker-installed" >/dev/null 2>&1 - DOCKER_INSTALLED_ON_FIRST_BOOT="no" else - msg_ok "Docker will be installed on first boot (installation failed during image preparation)" + msg_ok "Docker will be installed on first boot" fi else - msg_ok "Packages will be installed on first boot (network not available during image preparation)" + msg_ok "Packages will be installed on first boot" fi # Set hostname and clean machine-id @@ -861,23 +677,27 @@ virt-customize -q -a "${FILE}" --hostname "${HN}" >/dev/null 2>&1 virt-customize -q -a "${FILE}" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1 virt-customize -q -a "${FILE}" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1 -# Configure SSH to allow root login with password when Cloud-Init is enabled -# (Cloud-Init will set the password, but SSH needs to accept password authentication) +# Configure SSH for Cloud-Init if [ "$USE_CLOUD_INIT" = "yes" ]; then virt-customize -q -a "${FILE}" --run-command "sed -i 's/^#*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true virt-customize -q -a "${FILE}" --run-command "sed -i 's/^#*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true fi +# Expand disk msg_info "Expanding root partition to use full disk space" qemu-img create -f qcow2 expanded.qcow2 ${DISK_SIZE} >/dev/null 2>&1 virt-resize --quiet --expand /dev/sda1 ${FILE} expanded.qcow2 >/dev/null 2>&1 mv expanded.qcow2 ${FILE} >/dev/null 2>&1 msg_ok "Expanded image to full size" -msg_info "Creating a Docker VM" +# ============================================================================== +# VM CREATION +# ============================================================================== +msg_info "Creating Docker VM" qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \ -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci + pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null qm set $VMID \ @@ -887,88 +707,55 @@ qm set $VMID \ -serial0 socket >/dev/null qm set $VMID --agent enabled=1 >/dev/null -# Proxmox 9: Enable I/O Thread for better disk performance +# Proxmox 9: Enable I/O Thread if [ "${PVE_MAJOR:-8}" = "9" ]; then qm set $VMID -iothread 1 >/dev/null 2>&1 || true fi -msg_ok "Created a Docker VM ${CL}${BL}(${HN})${CL}" +msg_ok "Created Docker VM ${CL}${BL}(${HN})${CL}" -# Add Cloud-Init drive if requested +# Cloud-Init configuration if [ "$USE_CLOUD_INIT" = "yes" ]; then msg_info "Configuring Cloud-Init" setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes" >/dev/null 2>&1 msg_ok "Cloud-Init configured" fi -DESCRIPTION=$( - cat < - - Logo - - -

Docker VM

- -

- - spend Coffee - -

- - - - GitHub - - - - Discussions - - - - Issues - - -EOF -) -qm set "$VMID" -description "$DESCRIPTION" >/dev/null +# Set description +set_description +# Start VM if [ "$START_VM" == "yes" ]; then msg_info "Starting Docker VM" qm start $VMID >/dev/null 2>&1 msg_ok "Started Docker VM" fi -# Try to get VM IP address silently in background (max 10 seconds) +# ============================================================================== +# FINAL OUTPUT +# ============================================================================== VM_IP="" if [ "$START_VM" == "yes" ]; then for i in {1..5}; do VM_IP=$(qm guest cmd "$VMID" network-get-interfaces 2>/dev/null | jq -r '.[] | select(.name != "lo") | ."ip-addresses"[]? | select(."ip-address-type" == "ipv4") | ."ip-address"' 2>/dev/null | grep -v "^127\." | head -1) - - if [ -n "$VM_IP" ]; then - break - fi + [ -n "$VM_IP" ] && break sleep 2 done fi -# Display information about installed components echo -e "\n${INFO}${BOLD}${GN}VM Configuration Summary:${CL}" echo -e "${TAB}${DGN}VM ID: ${BGN}${VMID}${CL}" echo -e "${TAB}${DGN}Hostname: ${BGN}${HN}${CL}" echo -e "${TAB}${DGN}OS: ${BGN}${OS_DISPLAY}${CL}" -if [ -n "$VM_IP" ]; then - echo -e "${TAB}${DGN}IP Address: ${BGN}${VM_IP}${CL}" -fi +[ -n "$VM_IP" ] && echo -e "${TAB}${DGN}IP Address: ${BGN}${VM_IP}${CL}" if [ "$DOCKER_INSTALLED_ON_FIRST_BOOT" = "yes" ]; then echo -e "${TAB}${DGN}Docker: ${BGN}Will be installed on first boot${CL}" - echo -e "${TAB}${YW}⚠️ Docker installation will happen automatically after VM starts${CL}" echo -e "${TAB}${YW}⚠️ Wait 2-3 minutes after boot for installation to complete${CL}" - echo -e "${TAB}${YW}⚠️ Check installation progress: ${BL}cat /var/log/install-docker.log${CL}" + echo -e "${TAB}${YW}⚠️ Check progress: ${BL}cat /var/log/install-docker.log${CL}" else echo -e "${TAB}${DGN}Docker: ${BGN}Latest (via get.docker.com)${CL}" fi @@ -977,13 +764,13 @@ if [ "$INSTALL_PORTAINER" = "yes" ]; then if [ -n "$VM_IP" ]; then echo -e "${TAB}${DGN}Portainer: ${BGN}https://${VM_IP}:9443${CL}" else - echo -e "${TAB}${DGN}Portainer: ${BGN}Will be accessible at https://:9443${CL}" - echo -e "${TAB}${YW}⚠️ Wait 2-3 minutes after boot for installation to complete${CL}" - echo -e "${TAB}${YW}⚠️ Get IP with: ${BL}qm guest cmd ${VMID} network-get-interfaces${CL}" + echo -e "${TAB}${DGN}Portainer: ${BGN}https://:9443${CL}" + echo -e "${TAB}${YW}⚠️ Get IP: ${BL}qm guest cmd ${VMID} network-get-interfaces${CL}" fi fi + if [ "$USE_CLOUD_INIT" = "yes" ]; then - display_cloud_init_info "$VMID" "$HN" + display_cloud_init_info "$VMID" "$HN" 2>/dev/null || true fi post_update_to_api "done" "none" diff --git a/vm/headers/docker-vm b/vm/headers/docker-vm new file mode 100644 index 000000000..5c9890ed5 --- /dev/null +++ b/vm/headers/docker-vm @@ -0,0 +1,6 @@ + ____ __ _ ____ ___ + / __ \____ _____/ /_____ _____ | | / / |/ / + / / / / __ \/ ___/ //_/ _ \/ ___/ | | / / /|_/ / + / /_/ / /_/ / /__/ ,< / __/ / | |/ / / / / +/_____/\____/\___/_/|_|\___/_/ |___/_/ /_/ + From f431d59f93efd818715b37c8a8f88fcd030a4f1a Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 10:30:35 +0100 Subject: [PATCH 02/14] Improve update script generation for containers The update script now uses the OS variable for OS-based containers instead of the app name, and the script source URL has been updated to use git.community-scripts.org. This ensures the correct update script is fetched for each container type. --- misc/install.func | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/misc/install.func b/misc/install.func index 95ec028f8..54f037141 100644 --- a/misc/install.func +++ b/misc/install.func @@ -904,7 +904,9 @@ EOF fi # Create update script - echo "bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/ct/${app}.sh)\"" >/usr/bin/update + # Use var_os for OS-based containers, otherwise use app name + local update_script_name="${var_os:-$app}" + echo "bash -c \"\$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/ct/${update_script_name}.sh)\"" >/usr/bin/update chmod +x /usr/bin/update # Inject SSH authorized keys if provided From 2d264911d784595aec1b7fc8d5191c69547ffeb8 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 10:39:48 +0100 Subject: [PATCH 03/14] Update docker-vm.sh --- vm/docker-vm.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vm/docker-vm.sh b/vm/docker-vm.sh index a85a74301..e89fe6022 100644 --- a/vm/docker-vm.sh +++ b/vm/docker-vm.sh @@ -736,13 +736,16 @@ fi # ============================================================================== VM_IP="" if [ "$START_VM" == "yes" ]; then + # Disable error exit for optional IP retrieval + set +e for i in {1..5}; do VM_IP=$(qm guest cmd "$VMID" network-get-interfaces 2>/dev/null | jq -r '.[] | select(.name != "lo") | ."ip-addresses"[]? | select(."ip-address-type" == "ipv4") | ."ip-address"' 2>/dev/null | - grep -v "^127\." | head -1) + grep -v "^127\." | head -1) || true [ -n "$VM_IP" ] && break sleep 2 done + set -e fi echo -e "\n${INFO}${BOLD}${GN}VM Configuration Summary:${CL}" From 2d4892c45e23c59785e48c664b44926272991cbb Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 11:00:40 +0100 Subject: [PATCH 04/14] Add MeTube install and container scripts Introduces ct/metube.sh for Proxmox container setup and install/metube-install.sh for installing MeTube and its dependencies. Scripts automate container creation, dependency installation, MeTube deployment, and systemd service setup. --- ct/metube.sh | 113 ++++++++++++++++++++++++++++++++++++++ install/metube-install.sh | 73 ++++++++++++++++++++++++ 2 files changed, 186 insertions(+) create mode 100644 ct/metube.sh create mode 100644 install/metube-install.sh diff --git a/ct/metube.sh b/ct/metube.sh new file mode 100644 index 000000000..b62e22316 --- /dev/null +++ b/ct/metube.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) +# Copyright (c) 2021-2025 community-scripts ORG +# Author: MickLesk (Canbiz) +# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE +# Source: https://github.com/alexta69/metube + +APP="MeTube" +var_tags="${var_tags:-media;youtube}" +var_cpu="${var_cpu:-1}" +var_ram="${var_ram:-2048}" +var_disk="${var_disk:-10}" +var_os="${var_os:-debian}" +var_version="${var_version:-13}" +var_unprivileged="${var_unprivileged:-1}" + +header_info "$APP" +variables +color +catch_errors + +function update_script() { + header_info + check_container_storage + check_container_resources + + if [[ ! -d /opt/metube ]]; then + msg_error "No ${APP} Installation Found!" + exit + fi + + if [[ $(echo ":$PATH:" != *":/usr/local/bin:"*) ]]; then + echo -e "\nexport PATH=\"/usr/local/bin:\$PATH\"" >>~/.bashrc + source ~/.bashrc + if ! command -v deno &>/dev/null; then + export DENO_INSTALL="/usr/local" + curl -fsSL https://deno.land/install.sh | $STD sh -s -- -y + else + $STD deno upgrade + fi + fi + + if check_for_gh_release "metube" "alexta69/metube"; then + msg_info "Stopping Service" + systemctl stop metube + msg_ok "Stopped Service" + + msg_info "Backing up Old Installation" + if [[ -d /opt/metube_bak ]]; then + rm -rf /opt/metube_bak + fi + mv /opt/metube /opt/metube_bak + msg_ok "Backup created" + + fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest" + + msg_info "Building Frontend" + cd /opt/metube/ui + $STD npm install + $STD node_modules/.bin/ng build + msg_ok "Built Frontend" + + PYTHON_VERSION="3.13" setup_uv + + msg_info "Installing Backend Requirements" + cd /opt/metube + $STD uv sync + msg_ok "Installed Backend" + + msg_info "Restoring Environment File" + if [[ -f /opt/metube_bak/.env ]]; then + cp /opt/metube_bak/.env /opt/metube/.env + fi + rm -rf /opt/metube_bak + msg_ok "Restored .env" + + if grep -q 'pipenv' /etc/systemd/system/metube.service; then + msg_info "Patching systemd Service" + cat </etc/systemd/system/metube.service +[Unit] +Description=Metube - YouTube Downloader +After=network.target +[Service] +Type=simple +WorkingDirectory=/opt/metube +EnvironmentFile=/opt/metube/.env +ExecStart=/opt/metube/.venv/bin/python3 app/main.py +Restart=always +User=root +[Install] +WantedBy=multi-user.target +EOF + msg_ok "Patched systemd Service" + fi + $STD systemctl daemon-reload + msg_ok "Service Updated" + + msg_info "Starting Service" + systemctl start metube + msg_ok "Started Service" + msg_ok "Updated successfully!" + fi + exit +} + +start +build_container +description + +msg_ok "Completed Successfully!\n" +echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" +echo -e "${INFO}${YW} Access it using the following URL:${CL}" +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8081${CL}" diff --git a/install/metube-install.sh b/install/metube-install.sh new file mode 100644 index 000000000..1015d3816 --- /dev/null +++ b/install/metube-install.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash + +# Copyright (c) 2021-2025 community-scripts ORG +# Author: MickLesk (Canbiz) +# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE +# Source: https://github.com/alexta69/metube + +source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" +color +verb_ip6 +catch_errors +setting_up_container +network_check +update_os + +msg_info "Installing Dependencies" +$STD apt install -y \ + build-essential \ + aria2 \ + coreutils \ + musl-dev \ + ffmpeg +msg_ok "Installed Dependencies" + +PYTHON_VERSION="3.13" setup_uv +NODE_VERSION="24" setup_nodejs + +msg_info "Installing Deno" +export DENO_INSTALL="/usr/local" +curl -fsSL https://deno.land/install.sh | $STD sh -s -- -y +[[ ":$PATH:" != *":/usr/local/bin:"* ]] && + echo -e "\nexport PATH=\"/usr/local/bin:\$PATH\"" >>~/.bashrc && + source ~/.bashrc +msg_ok "Installed Deno" + +fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest" + +msg_info "Installing MeTube" +cd /opt/metube/ui +$STD npm ci +$STD node_modules/.bin/ng build --configuration production +cd /opt/metube +$STD uv sync +mkdir -p /opt/metube_downloads /opt/metube_downloads/.metube /opt/metube_downloads/music /opt/metube_downloads/videos +cat </opt/metube/.env +DOWNLOAD_DIR=/opt/metube_downloads +STATE_DIR=/opt/metube_downloads/.metube +TEMP_DIR=/opt/metube_downloads +YTDL_OPTIONS={"trim_file_name":10,"extractor_args":{"youtube":{"player_client":["default","-tv_simply"]}}} +EOF +msg_ok "Installed MeTube" + +msg_info "Creating Service" +cat </etc/systemd/system/metube.service +[Unit] +Description=Metube - YouTube Downloader +After=network.target +[Service] +Type=simple +WorkingDirectory=/opt/metube +EnvironmentFile=/opt/metube/.env +ExecStart=/opt/metube/.venv/bin/python3 app/main.py +Restart=always +User=root +[Install] +WantedBy=multi-user.target +EOF +systemctl enable -q --now metube +msg_ok "Created Service" + +motd_ssh +customize +cleanup_lxc From 979755cd049ef71ff7535ec94cde6292710043e3 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 11:01:20 +0100 Subject: [PATCH 05/14] Update metube-install.sh --- install/metube-install.sh | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/install/metube-install.sh b/install/metube-install.sh index 1015d3816..bdbf32859 100644 --- a/install/metube-install.sh +++ b/install/metube-install.sh @@ -43,10 +43,33 @@ cd /opt/metube $STD uv sync mkdir -p /opt/metube_downloads /opt/metube_downloads/.metube /opt/metube_downloads/music /opt/metube_downloads/videos cat </opt/metube/.env +# Storage & Directories DOWNLOAD_DIR=/opt/metube_downloads +AUDIO_DOWNLOAD_DIR=/opt/metube_downloads/music STATE_DIR=/opt/metube_downloads/.metube TEMP_DIR=/opt/metube_downloads -YTDL_OPTIONS={"trim_file_name":10,"extractor_args":{"youtube":{"player_client":["default","-tv_simply"]}}} + +# Download Behavior +DOWNLOAD_MODE=limited +MAX_CONCURRENT_DOWNLOADS=3 +DELETE_FILE_ON_TRASHCAN=false +DEFAULT_OPTION_PLAYLIST_STRICT_MODE=false +DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT=0 + +# File Naming & yt-dlp +OUTPUT_TEMPLATE=%(title)s.%(ext)s +OUTPUT_TEMPLATE_CHAPTER=%(title)s - %(section_number)s %(section_title)s.%(ext)s +OUTPUT_TEMPLATE_PLAYLIST=%(playlist_title)s/%(title)s.%(ext)s +YTDL_OPTIONS={"trim_file_name":200,"extractor_args":{"youtube":{"player_client":["default","-tv_simply"]}}} + +# Custom Directories +CUSTOM_DIRS=true +CREATE_CUSTOM_DIRS=true + +# Basic Setup +DEFAULT_THEME=auto +LOGLEVEL=INFO +ENABLE_ACCESSLOG=false EOF msg_ok "Installed MeTube" From 2e55a08a1b41434596059148a998511dc097a3b0 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 11:02:00 +0100 Subject: [PATCH 06/14] Create metube.json --- frontend/public/json/metube.json | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 frontend/public/json/metube.json diff --git a/frontend/public/json/metube.json b/frontend/public/json/metube.json new file mode 100644 index 000000000..db1bd6d70 --- /dev/null +++ b/frontend/public/json/metube.json @@ -0,0 +1,35 @@ +{ + "name": "MeTube", + "slug": "metube", + "categories": [ + 11 + ], + "date_created": "2025-12-05", + "type": "ct", + "updateable": true, + "privileged": false, + "interface_port": 8081, + "documentation": "https://github.com/alexta69/metube/blob/master/README.md", + "website": "https://github.com/alexta69/metube", + "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/metube.webp", + "config_path": "/opt/metube/.env", + "description": "MeTube allows you to download videos from YouTube and dozens of other sites.", + "install_methods": [ + { + "type": "default", + "script": "ct/metube.sh", + "resources": { + "cpu": 1, + "ram": 2048, + "hdd": 10, + "os": "debian", + "version": "13" + } + } + ], + "default_credentials": { + "username": null, + "password": null + }, + "notes": [] +} From b6e08003beebaca5818dfdab3402dcb2b57be9d3 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 11:05:18 +0100 Subject: [PATCH 07/14] Update docker-vm.sh --- vm/docker-vm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vm/docker-vm.sh b/vm/docker-vm.sh index e89fe6022..d8ab522fb 100644 --- a/vm/docker-vm.sh +++ b/vm/docker-vm.sh @@ -8,7 +8,7 @@ # Docker VM - Creates a Docker-ready Virtual Machine with optional Portainer # ============================================================================== -source /dev/stdin <<<$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/api.func) +source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/api.func) source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/vm-core.func) source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/cloud-init.func) 2>/dev/null || true load_functions @@ -526,7 +526,6 @@ echo -e "\n Loading..." check_root arch_check pve_check -ssh_check TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null @@ -543,6 +542,7 @@ post_to_api_vm # ============================================================================== # STORAGE SELECTION # ============================================================================== +echo "" msg_info "Validating Storage" while read -r line; do TAG=$(echo $line | awk '{print $1}') From c8e5b2b0cabd94c3c85aac7b93fe5a7a03edc2e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 5 Dec 2025 12:46:16 +0000 Subject: [PATCH 08/14] Deleted files for issue: MeTube --- ct/metube.sh | 113 ------------------------------- frontend/public/json/metube.json | 35 ---------- install/metube-install.sh | 96 -------------------------- 3 files changed, 244 deletions(-) delete mode 100644 ct/metube.sh delete mode 100644 frontend/public/json/metube.json delete mode 100644 install/metube-install.sh diff --git a/ct/metube.sh b/ct/metube.sh deleted file mode 100644 index b62e22316..000000000 --- a/ct/metube.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash -source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) -# Copyright (c) 2021-2025 community-scripts ORG -# Author: MickLesk (Canbiz) -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://github.com/alexta69/metube - -APP="MeTube" -var_tags="${var_tags:-media;youtube}" -var_cpu="${var_cpu:-1}" -var_ram="${var_ram:-2048}" -var_disk="${var_disk:-10}" -var_os="${var_os:-debian}" -var_version="${var_version:-13}" -var_unprivileged="${var_unprivileged:-1}" - -header_info "$APP" -variables -color -catch_errors - -function update_script() { - header_info - check_container_storage - check_container_resources - - if [[ ! -d /opt/metube ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - - if [[ $(echo ":$PATH:" != *":/usr/local/bin:"*) ]]; then - echo -e "\nexport PATH=\"/usr/local/bin:\$PATH\"" >>~/.bashrc - source ~/.bashrc - if ! command -v deno &>/dev/null; then - export DENO_INSTALL="/usr/local" - curl -fsSL https://deno.land/install.sh | $STD sh -s -- -y - else - $STD deno upgrade - fi - fi - - if check_for_gh_release "metube" "alexta69/metube"; then - msg_info "Stopping Service" - systemctl stop metube - msg_ok "Stopped Service" - - msg_info "Backing up Old Installation" - if [[ -d /opt/metube_bak ]]; then - rm -rf /opt/metube_bak - fi - mv /opt/metube /opt/metube_bak - msg_ok "Backup created" - - fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest" - - msg_info "Building Frontend" - cd /opt/metube/ui - $STD npm install - $STD node_modules/.bin/ng build - msg_ok "Built Frontend" - - PYTHON_VERSION="3.13" setup_uv - - msg_info "Installing Backend Requirements" - cd /opt/metube - $STD uv sync - msg_ok "Installed Backend" - - msg_info "Restoring Environment File" - if [[ -f /opt/metube_bak/.env ]]; then - cp /opt/metube_bak/.env /opt/metube/.env - fi - rm -rf /opt/metube_bak - msg_ok "Restored .env" - - if grep -q 'pipenv' /etc/systemd/system/metube.service; then - msg_info "Patching systemd Service" - cat </etc/systemd/system/metube.service -[Unit] -Description=Metube - YouTube Downloader -After=network.target -[Service] -Type=simple -WorkingDirectory=/opt/metube -EnvironmentFile=/opt/metube/.env -ExecStart=/opt/metube/.venv/bin/python3 app/main.py -Restart=always -User=root -[Install] -WantedBy=multi-user.target -EOF - msg_ok "Patched systemd Service" - fi - $STD systemctl daemon-reload - msg_ok "Service Updated" - - msg_info "Starting Service" - systemctl start metube - msg_ok "Started Service" - msg_ok "Updated successfully!" - fi - exit -} - -start -build_container -description - -msg_ok "Completed Successfully!\n" -echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" -echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8081${CL}" diff --git a/frontend/public/json/metube.json b/frontend/public/json/metube.json deleted file mode 100644 index db1bd6d70..000000000 --- a/frontend/public/json/metube.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "MeTube", - "slug": "metube", - "categories": [ - 11 - ], - "date_created": "2025-12-05", - "type": "ct", - "updateable": true, - "privileged": false, - "interface_port": 8081, - "documentation": "https://github.com/alexta69/metube/blob/master/README.md", - "website": "https://github.com/alexta69/metube", - "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/metube.webp", - "config_path": "/opt/metube/.env", - "description": "MeTube allows you to download videos from YouTube and dozens of other sites.", - "install_methods": [ - { - "type": "default", - "script": "ct/metube.sh", - "resources": { - "cpu": 1, - "ram": 2048, - "hdd": 10, - "os": "debian", - "version": "13" - } - } - ], - "default_credentials": { - "username": null, - "password": null - }, - "notes": [] -} diff --git a/install/metube-install.sh b/install/metube-install.sh deleted file mode 100644 index bdbf32859..000000000 --- a/install/metube-install.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021-2025 community-scripts ORG -# Author: MickLesk (Canbiz) -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://github.com/alexta69/metube - -source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" -color -verb_ip6 -catch_errors -setting_up_container -network_check -update_os - -msg_info "Installing Dependencies" -$STD apt install -y \ - build-essential \ - aria2 \ - coreutils \ - musl-dev \ - ffmpeg -msg_ok "Installed Dependencies" - -PYTHON_VERSION="3.13" setup_uv -NODE_VERSION="24" setup_nodejs - -msg_info "Installing Deno" -export DENO_INSTALL="/usr/local" -curl -fsSL https://deno.land/install.sh | $STD sh -s -- -y -[[ ":$PATH:" != *":/usr/local/bin:"* ]] && - echo -e "\nexport PATH=\"/usr/local/bin:\$PATH\"" >>~/.bashrc && - source ~/.bashrc -msg_ok "Installed Deno" - -fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest" - -msg_info "Installing MeTube" -cd /opt/metube/ui -$STD npm ci -$STD node_modules/.bin/ng build --configuration production -cd /opt/metube -$STD uv sync -mkdir -p /opt/metube_downloads /opt/metube_downloads/.metube /opt/metube_downloads/music /opt/metube_downloads/videos -cat </opt/metube/.env -# Storage & Directories -DOWNLOAD_DIR=/opt/metube_downloads -AUDIO_DOWNLOAD_DIR=/opt/metube_downloads/music -STATE_DIR=/opt/metube_downloads/.metube -TEMP_DIR=/opt/metube_downloads - -# Download Behavior -DOWNLOAD_MODE=limited -MAX_CONCURRENT_DOWNLOADS=3 -DELETE_FILE_ON_TRASHCAN=false -DEFAULT_OPTION_PLAYLIST_STRICT_MODE=false -DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT=0 - -# File Naming & yt-dlp -OUTPUT_TEMPLATE=%(title)s.%(ext)s -OUTPUT_TEMPLATE_CHAPTER=%(title)s - %(section_number)s %(section_title)s.%(ext)s -OUTPUT_TEMPLATE_PLAYLIST=%(playlist_title)s/%(title)s.%(ext)s -YTDL_OPTIONS={"trim_file_name":200,"extractor_args":{"youtube":{"player_client":["default","-tv_simply"]}}} - -# Custom Directories -CUSTOM_DIRS=true -CREATE_CUSTOM_DIRS=true - -# Basic Setup -DEFAULT_THEME=auto -LOGLEVEL=INFO -ENABLE_ACCESSLOG=false -EOF -msg_ok "Installed MeTube" - -msg_info "Creating Service" -cat </etc/systemd/system/metube.service -[Unit] -Description=Metube - YouTube Downloader -After=network.target -[Service] -Type=simple -WorkingDirectory=/opt/metube -EnvironmentFile=/opt/metube/.env -ExecStart=/opt/metube/.venv/bin/python3 app/main.py -Restart=always -User=root -[Install] -WantedBy=multi-user.target -EOF -systemctl enable -q --now metube -msg_ok "Created Service" - -motd_ssh -customize -cleanup_lxc From 49c87aecc43b671c666387e17b1a4d9b8b4be561 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 15:37:51 +0100 Subject: [PATCH 09/14] Update tools.func --- misc/tools.func | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/misc/tools.func b/misc/tools.func index 4e96d770a..4f1d6a4de 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -4805,7 +4805,6 @@ function setup_docker() { # Cleanup old repository configurations if [ -f /etc/apt/sources.list.d/docker.list ]; then - msg_info "Migrating from old Docker repository format" rm -f /etc/apt/sources.list.d/docker.list rm -f /etc/apt/keyrings/docker.asc fi @@ -4819,6 +4818,7 @@ function setup_docker() { "$(get_os_info codename)" \ "stable" \ "$(dpkg --print-architecture)" + msg_ok "Set up Docker Repository" # Install or upgrade Docker if [ "$docker_installed" = true ]; then @@ -4826,7 +4826,8 @@ function setup_docker() { DOCKER_LATEST_VERSION=$(apt-cache policy docker-ce | grep Candidate | awk '{print $2}' | cut -d':' -f2 | cut -d'-' -f1) if [ "$DOCKER_CURRENT_VERSION" != "$DOCKER_LATEST_VERSION" ]; then - msg_info "Updating Docker $DOCKER_CURRENT_VERSION β†’ $DOCKER_LATEST_VERSION" + msg_ok "Docker update available ($DOCKER_CURRENT_VERSION β†’ $DOCKER_LATEST_VERSION)" + msg_info "Updating Docker" $STD apt install -y --only-upgrade \ docker-ce \ docker-ce-cli \ @@ -4872,7 +4873,8 @@ EOF PORTAINER_LATEST=$(curl -fsSL https://registry.hub.docker.com/v2/repositories/portainer/portainer-ce/tags?page_size=100 | grep -oP '"name":"\K[0-9]+\.[0-9]+\.[0-9]+"' | head -1 | tr -d '"') if [ "$PORTAINER_CURRENT" != "$PORTAINER_LATEST" ]; then - read -r -p "${TAB3}Update Portainer $PORTAINER_CURRENT β†’ $PORTAINER_LATEST? " prompt + msg_ok "Portainer update available ($PORTAINER_CURRENT β†’ $PORTAINER_LATEST)" + read -r -p "${TAB3}Update Portainer? " prompt if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then msg_info "Updating Portainer" docker stop portainer @@ -4887,6 +4889,8 @@ EOF -v portainer_data:/data \ portainer/portainer-ce:latest msg_ok "Updated Portainer to $PORTAINER_LATEST" + else + msg_ok "Skipped Portainer update" fi else msg_ok "Portainer is up-to-date ($PORTAINER_CURRENT)" @@ -4934,6 +4938,7 @@ EOF done < <(docker ps --format '{{.Names}} {{.Image}}') if [ ${#containers_with_updates[@]} -gt 0 ]; then + msg_ok "Found ${#containers_with_updates[@]} container(s) with updates" echo "" echo "${TAB3}Container updates available:" for info in "${container_info[@]}"; do @@ -4962,6 +4967,8 @@ EOF msg_ok "Stopped and removed $container (please recreate with updated image)" fi done + else + msg_ok "Skipped container updates" fi else msg_ok "All containers are up-to-date" From fb85f6a8e2b3a9e75023dde9e0adecceeeae76b2 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 15:39:53 +0100 Subject: [PATCH 10/14] small fixes --- ct/discopanel.sh | 6 ++++-- install/discopanel-install.sh | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ct/discopanel.sh b/ct/discopanel.sh index 179002485..406602274 100644 --- a/ct/discopanel.sh +++ b/ct/discopanel.sh @@ -29,6 +29,8 @@ function update_script() { exit fi + setup_docker + if check_for_gh_release "discopanel" "nickheyer/discopanel"; then msg_info "Stopping Service" systemctl stop discopanel @@ -42,9 +44,8 @@ function update_script() { /opt/discopanel_backup_last/ msg_ok "Created Backup" - rm -rf /opt/discopanel - CLEAN_INSTALL= 1 fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "tarball" "latest" "/opt/discopanel" + msg_info "Setting up DiscoPanel" cd /opt/discopanel/web/discopanel $STD npm install @@ -55,6 +56,7 @@ function update_script() { msg_info "Restoring Data" cp -r /opt/discopanel_backup_last/* /opt/discopanel/data/ + rm -rf /opt/discopanel_backup_last msg_ok "Restored Data" msg_info "Starting Service" diff --git a/install/discopanel-install.sh b/install/discopanel-install.sh index 6337f0468..1c51a1479 100644 --- a/install/discopanel-install.sh +++ b/install/discopanel-install.sh @@ -19,13 +19,7 @@ msg_ok "Installed Dependencies" NODE_VERSION="22" setup_nodejs setup_go fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "tarball" "latest" "/opt/discopanel" - -msg_info "Installing Docker" -DOCKER_CONFIG_PATH='/etc/docker/daemon.json' -mkdir -p $(dirname $DOCKER_CONFIG_PATH) -echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -$STD sh <(curl -fsSL https://get.docker.com) -msg_ok "Installed Docker" +setup_docker msg_info "Setting up DiscoPanel" cd /opt/discopanel/web/discopanel From 0579353725db78e028c95def213398575acf5670 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 15:54:04 +0100 Subject: [PATCH 11/14] fix copy --- ct/discopanel.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ct/discopanel.sh b/ct/discopanel.sh index 406602274..1c957061e 100644 --- a/ct/discopanel.sh +++ b/ct/discopanel.sh @@ -37,11 +37,9 @@ function update_script() { msg_ok "Stopped Service" msg_info "Creating Backup" - mkdir -p /opt/discopanel_backup_last - cp -r /opt/discopanel/data/discopanel.db \ - /opt/discopanel/data/.recovery_key \ - /opt/discopanel/data/servers \ - /opt/discopanel_backup_last/ + if [[ -d /opt/discopanel/data ]]; then + cp -r /opt/discopanel/data /opt/discopanel_backup_last + fi msg_ok "Created Backup" CLEAN_INSTALL= 1 fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "tarball" "latest" "/opt/discopanel" @@ -55,8 +53,10 @@ function update_script() { msg_ok "Setup DiscoPanel" msg_info "Restoring Data" - cp -r /opt/discopanel_backup_last/* /opt/discopanel/data/ - rm -rf /opt/discopanel_backup_last + if [[ -d /opt/discopanel_backup_last ]]; then + cp -r /opt/discopanel_backup_last/* /opt/discopanel/data/ + rm -rf /opt/discopanel_backup_last + fi msg_ok "Restored Data" msg_info "Starting Service" From 255fc70c7c8e54b58870b1caa7870ebb22e28670 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 15:59:58 +0100 Subject: [PATCH 12/14] fix wrong space --- ct/discopanel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/discopanel.sh b/ct/discopanel.sh index 1c957061e..7f6b692c1 100644 --- a/ct/discopanel.sh +++ b/ct/discopanel.sh @@ -42,7 +42,7 @@ function update_script() { fi msg_ok "Created Backup" - CLEAN_INSTALL= 1 fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "tarball" "latest" "/opt/discopanel" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "tarball" "latest" "/opt/discopanel" msg_info "Setting up DiscoPanel" cd /opt/discopanel/web/discopanel From 2721be0257643fb37d580796b9d4c9744e11c6ce Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 5 Dec 2025 16:14:49 +0100 Subject: [PATCH 13/14] Update discopanel.sh --- ct/discopanel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/discopanel.sh b/ct/discopanel.sh index 7f6b692c1..aa0c5fb09 100644 --- a/ct/discopanel.sh +++ b/ct/discopanel.sh @@ -54,6 +54,7 @@ function update_script() { msg_info "Restoring Data" if [[ -d /opt/discopanel_backup_last ]]; then + mkdir -p /opt/discopanel/data cp -r /opt/discopanel_backup_last/* /opt/discopanel/data/ rm -rf /opt/discopanel_backup_last fi From e7fd0e04c1b7bce4a4825309bade76247f33e290 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 5 Dec 2025 17:19:11 +0000 Subject: [PATCH 14/14] Deleted files for issue: Endurain --- ct/endurain.sh | 83 -------------------- frontend/public/json/endurain.json | 40 ---------- install/endurain-install.sh | 122 ----------------------------- 3 files changed, 245 deletions(-) delete mode 100644 ct/endurain.sh delete mode 100644 frontend/public/json/endurain.json delete mode 100644 install/endurain-install.sh diff --git a/ct/endurain.sh b/ct/endurain.sh deleted file mode 100644 index 244f59dee..000000000 --- a/ct/endurain.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash -source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) -# Copyright (c) 2021-2025 community-scripts ORG -# Author: johanngrobe -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://github.com/joaovitoriasilva/endurain - -APP="Endurain" -var_tags="${var_tags:-sport;social-media}" -var_cpu="${var_cpu:-2}" -var_ram="${var_ram:-2048}" -var_disk="${var_disk:-5}" -var_os="${var_os:-debian}" -var_version="${var_version:-13}" -var_unprivileged="${var_unprivileged:-1}" - -header_info "$APP" -variables -color -catch_errors - -function update_script() { - header_info - check_container_storage - check_container_resources - - if [[ ! -d /opt/endurain ]]; then - msg_error "No ${APP} installation found!" - exit 1 - fi - if check_for_gh_release "endurain" "joaovitoriasilva/endurain"; then - msg_info "Stopping Service" - systemctl stop endurain - msg_ok "Stopped Service" - - msg_info "Creating Backup" - cp /opt/endurain/.env /opt/endurain.env - cp /opt/endurain/frontend/app/dist/env.js /opt/endurain.env.js - msg_ok "Created Backup" - - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "endurain" "joaovitoriasilva/endurain" "tarball" "latest" "/opt/endurain" - - msg_info "Preparing Update" - cd /opt/endurain - rm -rf \ - /opt/endurain/{docs,example.env,screenshot_01.png} \ - /opt/endurain/docker* \ - /opt/endurain/*.yml - cp /opt/endurain.env /opt/endurain/.env - rm /opt/endurain.env - msg_ok "Prepared Update" - - msg_info "Updating Frontend" - cd /opt/endurain/frontend/app - $STD npm ci - $STD npm run build - cp /opt/endurain.env.js /opt/endurain/frontend/app/dist/env.js - rm /opt/endurain.env.js - msg_ok "Updated Frontend" - - msg_info "Updating Backend" - cd /opt/endurain/backend - $STD poetry export -f requirements.txt --output requirements.txt --without-hashes - $STD uv venv - $STD uv pip install -r requirements.txt - msg_ok "Backend Updated" - - msg_info "Starting Service" - systemctl start endurain - msg_ok "Started Service" - msg_ok "Update Completed Successfully!" - fi - exit 0 -} - -start -build_container -description - -msg_ok "Completed Successfully!\n" -echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" -echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8080${CL}" diff --git a/frontend/public/json/endurain.json b/frontend/public/json/endurain.json deleted file mode 100644 index 6b9b57f41..000000000 --- a/frontend/public/json/endurain.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "Endurain", - "slug": "endurain", - "categories": [ - 24 - ], - "date_created": "2025-11-23", - "type": "ct", - "updateable": true, - "privileged": false, - "interface_port": 8080, - "documentation": "https://docs.endurain.com/", - "website": "https://github.com/joaovitoriasilva/endurain", - "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/endurain.webp", - "config_path": "/opt/endurain/.env", - "description": "Endurain is a self-hosted fitness tracking service designed to give users full control over their data and hosting environment. It's similar to Strava but focused on privacy and customization", - "install_methods": [ - { - "type": "default", - "script": "ct/endurain.sh", - "resources": { - "cpu": 2, - "ram": 2048, - "hdd": 5, - "os": "debian", - "version": "13" - } - } - ], - "default_credentials": { - "username": "admin", - "password": "admin" - }, - "notes": [ - { - "text": "When using a reverse proxy, edit `/opt/endurain/frontend/app/dist/env.js`.", - "type": "info" - } - ] -} diff --git a/install/endurain-install.sh b/install/endurain-install.sh deleted file mode 100644 index 8ad24a6a7..000000000 --- a/install/endurain-install.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021-2025 community-scripts ORG -# Author: johanngrobe -# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -# Source: https://github.com/joaovitoriasilva/endurain - -source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" -color -verb_ip6 -catch_errors -setting_up_container -network_check -update_os - -msg_info "Installing Dependencies" -$STD apt install -y \ - default-libmysqlclient-dev \ - build-essential \ - pkg-config -msg_ok "Installed Dependencies" - -PYTHON_VERSION="3.13" setup_uv -NODE_VERSION="24" setup_nodejs -PG_VERSION="17" PG_MODULES="postgis" setup_postgresql -PG_DB_NAME="enduraindb" PG_DB_USER="endurain" setup_postgresql_db - -fetch_and_deploy_gh_release "endurain" "joaovitoriasilva/endurain" "tarball" "latest" "/opt/endurain" - -msg_info "Setting up Endurain" -cd /opt/endurain -rm -rf \ - /opt/endurain/{docs,example.env,screenshot_01.png} \ - /opt/endurain/docker* \ - /opt/endurain/*.yml -mkdir -p /opt/endurain_data/{data,logs} -SECRET_KEY=$(openssl rand -hex 32) -FERNET_KEY=$(openssl rand -base64 32) -IP=$(hostname -I | awk '{print $1}') -ENDURAIN_HOST=http://${IP}:8080 -cat </opt/endurain/.env -DB_PASSWORD=${PG_DB_PASS} - -SECRET_KEY=${SECRET_KEY} -FERNET_KEY=${FERNET_KEY} - -TZ=Europe/Berlin -ENDURAIN_HOST=${ENDURAIN_HOST} -BEHIND_PROXY=false - -POSTGRES_DB=${PG_DB_NAME} -POSTGRES_USER=${PG_DB_USER} -PGDATA=/var/lib/postgresql/${PG_DB_NAME} - -DB_DATABASE=${PG_DB_NAME} -DB_USER=${PG_DB_USER} -DB_PORT=5432 -DB_HOST=localhost - -DATABASE_URL=postgresql+psycopg://${PG_DB_USER}:${PG_DB_PASS}@localhost:5432/${PG_DB_NAME} - -BACKEND_DIR="/opt/endurain/backend/app" -FRONTEND_DIR="/opt/endurain/frontend/app/dist" -DATA_DIR="/opt/endurain_data/data" -LOGS_DIR="/opt/endurain_data/logs" - -#SMTP_HOST=smtp.protonmail.ch -#SMTP_PORT=587 -#SMTP_USERNAME=your-email@example.com -#SMTP_PASSWORD=your-app-password -#SMTP_SECURE=true -#SMTP_SECURE_TYPE=starttls -EOF -msg_ok "Setup Endurain" - -msg_info "Building Frontend" -cd /opt/endurain/frontend/app -$STD npm ci --prefer-offline -$STD npm run build -cat </opt/endurain/frontend/app/dist/env.js -window.env = { - ENDURAIN_HOST: "${ENDURAIN_HOST}" -} -EOF -msg_ok "Built Frontend" - -msg_info "Setting up Backend" -cd /opt/endurain/backend -$STD uv tool install poetry -$STD uv tool update-shell -export PATH="/root/.local/bin:$PATH" -$STD poetry self add poetry-plugin-export -$STD poetry export -f requirements.txt --output requirements.txt --without-hashes -$STD uv venv -$STD uv pip install -r requirements.txt -msg_ok "Setup Backend" - -msg_info "Creating Service" -cat </etc/systemd/system/endurain.service -[Unit] -Description=Endurain FastAPI Backend -After=network.target postgresql.service - -[Service] -WorkingDirectory=/opt/endurain/backend/app -EnvironmentFile=/opt/endurain/.env -ExecStart=/opt/endurain/backend/.venv/bin/uvicorn main:app --host 0.0.0.0 --port 8080 -Restart=always -RestartSec=5 -User=root -StandardOutput=journal -StandardError=journal - -[Install] -WantedBy=multi-user.target -EOF -systemctl enable -q --now endurain -msg_ok "Created Service" - -motd_ssh -customize -cleanup_lxc