add cloudinit function

Merge branch 'main' into docker_deb13
Update fmt.Println message from 'Hello' to 'Goodbye'
2026-02-05 21:03:24 +01:00 · 2026-02-04 20:30:37 +01:00 · 2026-02-04 09:33:20 +01:00 · 2026-02-04 09:32:22 +01:00 · 2025-11-11 14:52:09 +01:00 · 2025-11-11 09:37:01 +01:00
9 changed files with 436 additions and 1669 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -776,14 +776,7 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit

 ### 🆕 New Scripts

-  - Wishlist ([#11527](https://github.com/community-scripts/ProxmoxVE/pull/11527))
- WriteFreely ([#11524](https://github.com/community-scripts/ProxmoxVE/pull/11524))
-
-### 💾 Core
-
-  - #### ✨ New Features
-
-    - core: create vm-core.func from dev [@MickLesk](https://github.com/MickLesk) ([#11528](https://github.com/community-scripts/ProxmoxVE/pull/11528))
+  - writefreely ([#11524](https://github.com/community-scripts/ProxmoxVE/pull/11524))

 ## 2026-02-03

--- a/ct/headers/wishlist
+++ b/ct/headers/wishlist
@@ -1,6 +0,0 @@
- _       ___      __    ___      __ 
-| |     / (_)____/ /_  / (_)____/ /_
-| | /| / / / ___/ __ \/ / / ___/ __/
-| |/ |/ / (__  ) / / / / (__  ) /_  
-|__/|__/_/____/_/ /_/_/_/____/\__/  
-                                    
--- a/ct/wishlist.sh
+++ b/ct/wishlist.sh
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Dunky13
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/cmintey/wishlist
-
-APP="Wishlist"
-var_tags="${var_tags:-sharing}"
-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/wishlist ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "wishlist" "cmintey/wishlist"; then
-    NODE_VERSION="24" NODE_MODULE="pnpm" setup_nodejs
-
-    msg_info "Stopping Service"
-    systemctl stop wishlist
-    msg_ok "Stopped Service"
-
-    msg_info "Creating Backup"
-    mkdir -p /opt/wishlist-backup
-    cp /opt/wishlist/.env /opt/wishlist-backup/.env
-    cp -a /opt/wishlist/uploads /opt/wishlist-backup
-    cp -a /opt/wishlist/data /opt/wishlist-backup
-    msg_ok "Created Backup"
-
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wishlist" "cmintey/wishlist" "tarball"
-    LATEST_APP_VERSION=$(get_latest_github_release "cmintey/wishlist")
-
-    msg_info "Updating Wishlist"
-    cd /opt/wishlist
-    $STD pnpm install
-    $STD pnpm svelte-kit sync
-    $STD pnpm prisma generate
-    sed -i 's|/usr/src/app/|/opt/wishlist/|g' $(grep -rl '/usr/src/app/' /opt/wishlist)
-    export VERSION="v${LATEST_APP_VERSION}"
-    export SHA="v${LATEST_APP_VERSION}"
-    $STD pnpm run build
-    $STD pnpm prune --prod
-    chmod +x /opt/wishlist/entrypoint.sh
-
-    msg_info "Restoring Backup"
-    cp /opt/wishlist-backup/.env /opt/wishlist/.env
-    cp -a /opt/wishlist-backup/uploads /opt/wishlist
-    cp -a /opt/wishlist-backup/data /opt/wishlist
-    rm -rf /opt/wishlist-backup
-    msg_ok "Restored Backup"
-    
-    msg_ok "Updated Wishlist"
-    msg_info "Starting Service"
-    systemctl start wishlist
-    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}:3280${CL}"
--- a/frontend/public/json/update-apps.json
+++ b/frontend/public/json/update-apps.json
@@ -1,84 +0,0 @@
-{
-    "name": "PVE LXC Apps Updater",
-    "slug": "update-apps",
-    "categories": [
-        1
-    ],
-    "date_created": "2025-02-04",
-    "type": "pve",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": null,
-    "documentation": "https://github.com/community-scripts/ProxmoxVE/discussions/11532",
-    "website": null,
-    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/proxmox.webp",
-    "config_path": "",
-    "description": "This script updates community-scripts managed LXC containers on a Proxmox VE node. It detects the installed service, verifies available update scripts, and applies updates interactively or unattended. Optionally, containers can be backed up before the update process. If additional build resources (CPU/RAM) are required, the script adjusts container resources temporarily and restores them after the update. Containers requiring a reboot will be listed at the end of the process.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "tools/pve/update-apps.sh",
-            "resources": {
-                "cpu": null,
-                "ram": null,
-                "hdd": null,
-                "os": null,
-                "version": null
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
-    },
-    "notes": [
-        {
-            "text": "Execute within the Proxmox shell.",
-            "type": "info"
-        },
-        {
-            "text": "Full Guide can be found here: `https://github.com/community-scripts/ProxmoxVE/discussions/11532`",
-            "type": "info"
-        },
-        {
-            "text": "Only containers with `community-script` or `proxmox-helper-scripts` tags are listed for update.",
-            "type": "info"
-        },
-        {
-            "text": "Optionally performs a vzdump backup before updating containers.",
-            "type": "warning"
-        },
-        {
-            "text": "If required, the script will temporarily increase container CPU/RAM resources for the build process and restore them after completion.",
-            "type": "info"
-        },
-        {
-            "text": "At the end of the update, containers requiring a reboot will be listed, and you may choose to reboot them directly.",
-            "type": "info"
-        },
-        {
-            "text": "Use `var_backup=yes|no` to enable/disable backup (skip prompt).",
-            "type": "info"
-        },
-        {
-            "text": "Use `var_backup_storage=<name>` to set backup storage location.",
-            "type": "info"
-        },
-        {
-            "text": "Use `var_container=all|all_running|all_stopped|101,102,...` to select containers.",
-            "type": "info"
-        },
-        {
-            "text": "Use `var_unattended=yes|no` to run updates without interaction.",
-            "type": "info"
-        },
-        {
-            "text": "Use `var_skip_confirm=yes` to skip initial confirmation dialog.",
-            "type": "info"
-        },
-        {
-            "text": "Use `var_auto_reboot=yes|no` to auto-reboot containers after update.",
-            "type": "info"
-        }
-    ]
-}
--- a/frontend/public/json/wishlist.json
+++ b/frontend/public/json/wishlist.json
@@ -1,35 +0,0 @@
-{
-    "name": "Wishlist",
-    "slug": "wishlist",
-    "categories": [
-        12
-    ],
-    "date_created": "2026-02-04",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 3280,
-    "documentation": "https://github.com/cmintey/wishlist/blob/main/README.md#getting-started",
-    "config_path": "/opt/wishlist/.env",
-    "website": "https://github.com/cmintey/wishlist",
-    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/cmintey-wishlist.webp",
-    "description": "Wishlist is a self-hosted wishlist application that you can share with your friends and family. You no longer have to wonder what to get your family for the holidays, simply check their wishlist and claim any available item!",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/wishlist.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 2048,
-                "hdd": 5,
-                "os": "Debian",
-                "version": "13"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
-    },
-    "notes": []
-}
--- a/install/wishlist-install.sh
+++ b/install/wishlist-install.sh
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Dunky13
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/cmintey/wishlist
-
-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 \
-  openssl \
-  caddy
-msg_ok "Installed dependencies"
-
-NODE_VERSION="24" NODE_MODULE="pnpm" setup_nodejs
-fetch_and_deploy_gh_release "wishlist" "cmintey/wishlist" "tarball"
-LATEST_APP_VERSION=$(get_latest_github_release "cmintey/wishlist")
-
-msg_info "Installing Wishlist"
-cd /opt/wishlist
-cp .env.example .env
-sed -i "s|^ORIGIN=.*|ORIGIN=http://${LOCAL_IP}:3280|" /opt/wishlist/.env
-echo "" >>/opt/wishlist/.env
-echo "NODE_ENV=production" >>/opt/wishlist/.env
-$STD pnpm install
-$STD pnpm svelte-kit sync
-$STD pnpm prisma generate
-sed -i 's|/usr/src/app/|/opt/wishlist/|g' $(grep -rl '/usr/src/app/' /opt/wishlist)
-export VERSION="v${LATEST_APP_VERSION}"
-export SHA="v${LATEST_APP_VERSION}"
-$STD pnpm run build
-$STD pnpm prune --prod
-chmod +x /opt/wishlist/entrypoint.sh
-mkdir -p /opt/wishlist/uploads
-mkdir -p /opt/wishlist/data
-msg_ok "Installed Wishlist"
-
-msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/wishlist.service
-[Unit]
-Description=Wishlist Service
-After=network.target
-
-[Service]
-WorkingDirectory=/opt/wishlist
-EnvironmentFile=/opt/wishlist/.env
-ExecStart=/usr/bin/env sh -c './entrypoint.sh'
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now wishlist
-msg_ok "Created Service"
-
-motd_ssh
-customize
-cleanup_lxc
--- a/misc/vm-core.func
+++ b/misc/vm-core.func
@@ -1,620 +0,0 @@
-# Copyright (c) 2021-2026 community-scripts ORG
-# License: MIT | https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/LICENSE
-
-set -euo pipefail
-SPINNER_PID=""
-SPINNER_ACTIVE=0
-SPINNER_MSG=""
-declare -A MSG_INFO_SHOWN
-
-# ------------------------------------------------------------------------------
-# Loads core utility groups once (colors, formatting, icons, defaults).
-# ------------------------------------------------------------------------------
-
-[[ -n "${_CORE_FUNC_LOADED:-}" ]] && return
-_CORE_FUNC_LOADED=1
-
-load_functions() {
-  [[ -n "${__FUNCTIONS_LOADED:-}" ]] && return
-  __FUNCTIONS_LOADED=1
-  color
-  formatting
-  icons
-  default_vars
-  set_std_mode
-  shell_check
-  get_valid_nextid
-  cleanup_vmid
-  cleanup
-  check_root
-  pve_check
-  arch_check
-}
-
-# Function to download & save header files
-get_header() {
-  local app_name=$(echo "${APP,,}" | tr ' ' '-')
-  local app_type=${APP_TYPE:-vm}
-  local header_url="https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/${app_type}/headers/${app_name}"
-  local local_header_path="/usr/local/community-scripts/headers/${app_type}/${app_name}"
-
-  mkdir -p "$(dirname "$local_header_path")"
-
-  if [ ! -s "$local_header_path" ]; then
-    if ! curl -fsSL "$header_url" -o "$local_header_path"; then
-      return 1
-    fi
-  fi
-
-  cat "$local_header_path" 2>/dev/null || true
-}
-
-header_info() {
-  local app_name=$(echo "${APP,,}" | tr ' ' '-')
-  local header_content
-
-  header_content=$(get_header "$app_name") || header_content=""
-
-  clear
-  local term_width
-  term_width=$(tput cols 2>/dev/null || echo 120)
-
-  if [ -n "$header_content" ]; then
-    echo "$header_content"
-  fi
-}
-
-# ------------------------------------------------------------------------------
-# Sets ANSI color codes used for styled terminal output.
-# ------------------------------------------------------------------------------
-color() {
-  YW=$(echo "\033[33m")
-  YWB=$(echo "\033[93m")
-  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")
-}
-
-# ------------------------------------------------------------------------------
-# Defines formatting helpers like tab, bold, and line reset sequences.
-# ------------------------------------------------------------------------------
-formatting() {
-  BFR="\\r\\033[K"
-  BOLD=$(echo "\033[1m")
-  HOLD=" "
-  TAB="  "
-  TAB3="      "
-}
-
-# ------------------------------------------------------------------------------
-# Sets symbolic icons used throughout user feedback and prompts.
-# ------------------------------------------------------------------------------
-icons() {
-  CM="${TAB}✔️${TAB}"
-  CROSS="${TAB}✖️${TAB}"
-  DNSOK="✔️ "
-  DNSFAIL="${TAB}✖️${TAB}"
-  INFO="${TAB}💡${TAB}${CL}"
-  OS="${TAB}🖥️${TAB}${CL}"
-  OSVERSION="${TAB}🌟${TAB}${CL}"
-  CONTAINERTYPE="${TAB}📦${TAB}${CL}"
-  DISKSIZE="${TAB}💾${TAB}${CL}"
-  CPUCORE="${TAB}🧠${TAB}${CL}"
-  RAMSIZE="${TAB}🛠️${TAB}${CL}"
-  SEARCH="${TAB}🔍${TAB}${CL}"
-  VERBOSE_CROPPED="🔍${TAB}"
-  VERIFYPW="${TAB}🔐${TAB}${CL}"
-  CONTAINERID="${TAB}🆔${TAB}${CL}"
-  HOSTNAME="${TAB}🏠${TAB}${CL}"
-  BRIDGE="${TAB}🌉${TAB}${CL}"
-  NETWORK="${TAB}📡${TAB}${CL}"
-  GATEWAY="${TAB}🌐${TAB}${CL}"
-  DISABLEIPV6="${TAB}🚫${TAB}${CL}"
-  ICON_DISABLEIPV6="${TAB}🚫${TAB}${CL}"
-  DEFAULT="${TAB}⚙️${TAB}${CL}"
-  MACADDRESS="${TAB}🔗${TAB}${CL}"
-  VLANTAG="${TAB}🏷️${TAB}${CL}"
-  ROOTSSH="${TAB}🔑${TAB}${CL}"
-  CREATING="${TAB}🚀${TAB}${CL}"
-  ADVANCED="${TAB}🧩${TAB}${CL}"
-  FUSE="${TAB}🗂️${TAB}${CL}"
-  GPU="${TAB}🎮${TAB}${CL}"
-  HOURGLASS="${TAB}⏳${TAB}"
-}
-
-# ------------------------------------------------------------------------------
-# Sets default verbose mode for script and os execution.
-# ------------------------------------------------------------------------------
-set_std_mode() {
-  if [ "${VERBOSE:-no}" = "yes" ]; then
-    STD=""
-  else
-    STD="silent"
-  fi
-}
-
-# ------------------------------------------------------------------------------
-# default_vars()
-#
-# - Sets default retry and wait variables used for system actions
-# - RETRY_NUM: Maximum number of retry attempts (default: 10)
-# - RETRY_EVERY: Seconds to wait between retries (default: 3)
-# ------------------------------------------------------------------------------
-default_vars() {
-  RETRY_NUM=10
-  RETRY_EVERY=3
-  i=$RETRY_NUM
-}
-
-# ------------------------------------------------------------------------------
-# get_active_logfile()
-#
-# - Returns the appropriate log file based on execution context
-# - BUILD_LOG: Host operations (VM creation)
-# - Fallback to /tmp/build-<timestamp>.log if not set
-# ------------------------------------------------------------------------------
-get_active_logfile() {
-  if [[ -n "${BUILD_LOG:-}" ]]; then
-    echo "$BUILD_LOG"
-  else
-    # Fallback for legacy scripts
-    echo "/tmp/build-$(date +%Y%m%d_%H%M%S).log"
-  fi
-}
-
-# ------------------------------------------------------------------------------
-# silent()
-#
-# - Executes command with output redirected to active log file
-# - On error: displays last 10 lines of log and exits with original exit code
-# - Temporarily disables error trap to capture exit code correctly
-# - Sources explain_exit_code() for detailed error messages
-# ------------------------------------------------------------------------------
-silent() {
-  local cmd="$*"
-  local caller_line="${BASH_LINENO[0]:-unknown}"
-  local logfile="$(get_active_logfile)"
-
-  set +Eeuo pipefail
-  trap - ERR
-
-  "$@" >>"$logfile" 2>&1
-  local rc=$?
-
-  set -Eeuo pipefail
-  trap 'error_handler' ERR
-
-  if [[ $rc -ne 0 ]]; then
-    # Source explain_exit_code if needed
-    if ! declare -f explain_exit_code >/dev/null 2>&1; then
-      source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/error_handler.func) 2>/dev/null || true
-    fi
-
-    local explanation=""
-    if declare -f explain_exit_code >/dev/null 2>&1; then
-      explanation="$(explain_exit_code "$rc")"
-    fi
-
-    printf "\e[?25h"
-    if [[ -n "$explanation" ]]; then
-      msg_error "in line ${caller_line}: exit code ${rc} (${explanation})"
-    else
-      msg_error "in line ${caller_line}: exit code ${rc}"
-    fi
-    msg_custom "→" "${YWB}" "${cmd}"
-
-    if [[ -s "$logfile" ]]; then
-      local log_lines=$(wc -l <"$logfile")
-      echo "--- Last 10 lines of log ---"
-      tail -n 10 "$logfile"
-      echo "----------------------------"
-
-      # Show how to view full log if there are more lines
-      if [[ $log_lines -gt 10 ]]; then
-        msg_custom "📋" "${YW}" "View full log (${log_lines} lines): ${logfile}"
-      fi
-    fi
-
-    exit "$rc"
-  fi
-}
-
-# ------------------------------------------------------------------------------
-# Performs a curl request with retry logic and inline feedback.
-# ------------------------------------------------------------------------------
-
-run_curl() {
-  if [ "$VERB" = "no" ]; then
-    curl "$@" >/dev/null 2>>/tmp/curl_error.log
-  else
-    curl "$@" 2>>/tmp/curl_error.log
-  fi
-}
-
-curl_handler() {
-  local args=()
-  local url=""
-  local max_retries=0 delay=2 attempt=1
-  local exit_code has_output_file=false
-
-  for arg in "$@"; do
-    if [[ "$arg" != -* && -z "$url" ]]; then
-      url="$arg"
-    fi
-    [[ "$arg" == "-o" || "$arg" == --output ]] && has_output_file=true
-    args+=("$arg")
-  done
-
-  if [[ -z "$url" ]]; then
-    msg_error "no valid url or option entered for curl_handler"
-    exit 1
-  fi
-
-  $STD msg_info "Fetching: $url"
-
-  while :; do
-    if $has_output_file; then
-      $STD run_curl "${args[@]}"
-      exit_code=$?
-    else
-      $STD result=$(run_curl "${args[@]}")
-      exit_code=$?
-    fi
-
-    if [[ $exit_code -eq 0 ]]; then
-      stop_spinner
-      msg_ok "Fetched: $url"
-      $has_output_file || printf '%s' "$result"
-      return 0
-    fi
-
-    if ((attempt >= max_retries)); then
-      stop_spinner
-      if [ -s /tmp/curl_error.log ]; then
-        local curl_stderr
-        curl_stderr=$(</tmp/curl_error.log)
-        rm -f /tmp/curl_error.log
-      fi
-      __curl_err_handler "$exit_code" "$url" "$curl_stderr"
-      exit 1 # hard exit if exit_code is not 0
-    fi
-
-    $STD printf "\r\033[K${INFO}${YW}Retry $attempt/$max_retries in ${delay}s...${CL}" >&2
-    sleep "$delay"
-    ((attempt++))
-  done
-}
-
-# ------------------------------------------------------------------------------
-# Handles specific curl error codes and displays descriptive messages.
-# ------------------------------------------------------------------------------
-__curl_err_handler() {
-  local exit_code="$1"
-  local target="$2"
-  local curl_msg="$3"
-
-  case $exit_code in
-  1) msg_error "Unsupported protocol: $target" ;;
-  2) msg_error "Curl init failed: $target" ;;
-  3) msg_error "Malformed URL: $target" ;;
-  5) msg_error "Proxy resolution failed: $target" ;;
-  6) msg_error "Host resolution failed: $target" ;;
-  7) msg_error "Connection failed: $target" ;;
-  9) msg_error "Access denied: $target" ;;
-  18) msg_error "Partial file transfer: $target" ;;
-  22) msg_error "HTTP error (e.g. 400/404): $target" ;;
-  23) msg_error "Write error on local system: $target" ;;
-  26) msg_error "Read error from local file: $target" ;;
-  28) msg_error "Timeout: $target" ;;
-  35) msg_error "SSL connect error: $target" ;;
-  47) msg_error "Too many redirects: $target" ;;
-  51) msg_error "SSL cert verify failed: $target" ;;
-  52) msg_error "Empty server response: $target" ;;
-  55) msg_error "Send error: $target" ;;
-  56) msg_error "Receive error: $target" ;;
-  60) msg_error "SSL CA not trusted: $target" ;;
-  67) msg_error "Login denied by server: $target" ;;
-  78) msg_error "Remote file not found (404): $target" ;;
-  *) msg_error "Curl failed with code $exit_code: $target" ;;
-  esac
-
-  [[ -n "$curl_msg" ]] && printf "%s\n" "$curl_msg" >&2
-  exit 1
-}
-
-# ------------------------------------------------------------------------------
-# shell_check()
-#
-# - Verifies that the script is running under Bash shell
-# - Exits with error message if different shell is detected
-# ------------------------------------------------------------------------------
-shell_check() {
-  if [[ "$(ps -p $$ -o comm=)" != "bash" ]]; then
-    clear
-    msg_error "Your default shell is currently not set to Bash. To use these scripts, please switch to the Bash shell."
-    echo -e "\nExiting..."
-    sleep 2
-    exit
-  fi
-}
-
-# ------------------------------------------------------------------------------
-# clear_line()
-#
-# - Clears current terminal line using tput or ANSI escape codes
-# - Moves cursor to beginning of line (carriage return)
-# - Fallback to ANSI codes if tput not available
-# ------------------------------------------------------------------------------
-clear_line() {
-  tput cr 2>/dev/null || echo -en "\r"
-  tput el 2>/dev/null || echo -en "\033[K"
-}
-
-# ------------------------------------------------------------------------------
-# is_verbose_mode()
-#
-# - Determines if script should run in verbose mode
-# - Checks VERBOSE and var_verbose variables
-# - Also returns true if not running in TTY (pipe/redirect scenario)
-# ------------------------------------------------------------------------------
-is_verbose_mode() {
-  local verbose="${VERBOSE:-${var_verbose:-no}}"
-  [[ "$verbose" != "no" || ! -t 2 ]]
-}
-
-### dev spinner ###
-SPINNER_ACTIVE=0
-SPINNER_PID=""
-SPINNER_MSG=""
-declare -A MSG_INFO_SHOWN=()
-
-# Trap cleanup on various signals
-trap 'cleanup_spinner' EXIT INT TERM HUP
-
-# Cleans up spinner process on exit
-cleanup_spinner() {
-  stop_spinner
-  # Additional cleanup if needed
-}
-
-start_spinner() {
-  local msg="${1:-Processing...}"
-  local frames=(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏)
-  local spin_i=0
-  local interval=0.1
-
-  # Set message and clear current line
-  SPINNER_MSG="$msg"
-  printf "\r\e[2K" >&2
-
-  # Stop any existing spinner
-  stop_spinner
-
-  # Set active flag
-  SPINNER_ACTIVE=1
-
-  # Start spinner in background
-  {
-    while [[ "$SPINNER_ACTIVE" -eq 1 ]]; do
-      printf "\r\e[2K%s %b" "${TAB}${frames[spin_i]}${TAB}" "${YW}${SPINNER_MSG}${CL}" >&2
-      spin_i=$(((spin_i + 1) % ${#frames[@]}))
-      sleep "$interval"
-    done
-  } &
-
-  SPINNER_PID=$!
-
-  # Disown to prevent getting "Terminated" messages
-  disown "$SPINNER_PID" 2>/dev/null || true
-}
-
-stop_spinner() {
-  # Check if spinner is active and PID exists
-  if [[ "$SPINNER_ACTIVE" -eq 1 ]] && [[ -n "${SPINNER_PID}" ]]; then
-    SPINNER_ACTIVE=0
-
-    if kill -0 "$SPINNER_PID" 2>/dev/null; then
-      kill "$SPINNER_PID" 2>/dev/null
-      # Give it a moment to terminate
-      sleep 0.1
-      # Force kill if still running
-      if kill -0 "$SPINNER_PID" 2>/dev/null; then
-        kill -9 "$SPINNER_PID" 2>/dev/null
-      fi
-      # Wait for process but ignore errors
-      wait "$SPINNER_PID" 2>/dev/null || true
-    fi
-
-    # Clear spinner line
-    printf "\r\e[2K" >&2
-    SPINNER_PID=""
-  fi
-}
-
-spinner_guard() {
-  # Safely stop spinner if it's running
-  if [[ "$SPINNER_ACTIVE" -eq 1 ]] && [[ -n "${SPINNER_PID}" ]]; then
-    stop_spinner
-  fi
-}
-
-msg_info() {
-  local msg="${1:-Information message}"
-
-  # Only show each message once unless reset
-  if [[ -n "${MSG_INFO_SHOWN["$msg"]+x}" ]]; then
-    return
-  fi
-  MSG_INFO_SHOWN["$msg"]=1
-
-  spinner_guard
-  start_spinner "$msg"
-}
-
-msg_ok() {
-  local msg="${1:-Operation completed successfully}"
-  stop_spinner
-  printf "\r\e[2K%s %b\n" "${CM}" "${GN}${msg}${CL}" >&2
-
-  # Remove from shown messages to allow it to be shown again
-  local sanitized_msg
-  sanitized_msg=$(printf '%s' "$msg" | sed 's/\x1b\[[0-9;]*m//g; s/[^a-zA-Z0-9_]/_/g')
-  unset 'MSG_INFO_SHOWN['"$sanitized_msg"']' 2>/dev/null || true
-}
-
-msg_error() {
-  local msg="${1:-An error occurred}"
-  stop_spinner
-  printf "\r\e[2K%s %b\n" "${CROSS}" "${RD}${msg}${CL}" >&2
-}
-
-msg_warn() {
-  stop_spinner
-  local msg="$1"
-  echo -e "${BFR:-}${INFO:-ℹ️} ${YWB}${msg}${CL}" >&2
-}
-
-# Helper function to display a message with custom symbol and color
-msg_custom() {
-  local symbol="${1:-*}"
-  local color="${2:-$CL}"
-  local msg="${3:-Custom message}"
-  [[ -z "$msg" ]] && return
-  stop_spinner
-  printf "\r\e[2K%s %b\n" "$symbol" "${color}${msg}${CL}" >&2
-}
-
-# ------------------------------------------------------------------------------
-# msg_debug()
-#
-# - Displays debug message with timestamp when var_full_verbose=1
-# - Automatically enables var_verbose if not already set
-# - Uses bright yellow color for debug output
-# ------------------------------------------------------------------------------
-msg_debug() {
-  if [[ "${var_full_verbose:-0}" == "1" ]]; then
-    [[ "${var_verbose:-0}" != "1" ]] && var_verbose=1
-    echo -e "${YWB}[$(date '+%F %T')] [DEBUG]${CL} $*"
-  fi
-}
-
-# Displays error message and immediately terminates script
-fatal() {
-  msg_error "$1"
-  kill -INT $$
-}
-
-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"
-}
-
-cleanup_vmid() {
-  if [[ -z "${VMID:-}" ]]; then
-    return
-  fi
-  if qm status "$VMID" &>/dev/null; then
-    qm stop "$VMID" &>/dev/null
-    qm destroy "$VMID" &>/dev/null
-  fi
-}
-
-cleanup() {
-  if [[ "$(dirs -p | wc -l)" -gt 1 ]]; then
-    popd >/dev/null || true
-  fi
-}
-
-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
-}
-
-pve_check() {
-  if ! pveversion | grep -Eq "pve-manager/(8\.[1-4]|9\.[0-1])(\.[0-9]+)*"; then
-    msg_error "This version of Proxmox Virtual Environment is not supported"
-    echo -e "Requires Proxmox Virtual Environment Version 8.1 - 8.4 or 9.0 - 9.1."
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-
-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
-}
-
-exit_script() {
-  clear
-  echo -e "\n${CROSS}${RD}User exited script${CL}\n"
-  exit
-}
-
-check_hostname_conflict() {
-  local hostname="$1"
-  if qm list | awk '{print $2}' | grep -qx "$hostname"; then
-    msg_error "Hostname $hostname already in use by another VM."
-    exit 1
-  fi
-}
-
-set_description() {
-  DESCRIPTION=$(
-    cat <<EOF
-<div align='center'>
-  <a href='https://Helper-Scripts.com' target='_blank' rel='noopener noreferrer'>
-    <img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
-  </a>
-
-  <h2 style='font-size: 24px; margin: 20px 0;'>${NSAPP} VM</h2>
-
-  <p style='margin: 16px 0;'>
-    <a href='https://ko-fi.com/community_scripts' target='_blank' rel='noopener noreferrer'>
-      <img src='https://img.shields.io/badge/&#x2615;-Buy us a coffee-blue' alt='spend Coffee' />
-    </a>
-  </p>
-
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
-  </span>
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a>
-  </span>
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a>
-  </span>
-</div>
-EOF
-  )
-  qm set "$VMID" -description "$DESCRIPTION" >/dev/null
-
-}
--- a/tools/pve/update-apps.sh
+++ b/tools/pve/update-apps.sh
@@ -1,471 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: BvdBerg01 | Co-Author: remz1337
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/refs/heads/main/misc/core.func)
-
-# =============================================================================
-# CONFIGURATION VARIABLES
-# Set these variables to skip interactive prompts (Whiptail dialogs)
-# =============================================================================
-# var_backup: Enable/disable backup before update
-#   Options: "yes" | "no" | "" (empty = interactive prompt)
-var_backup="${var_backup:-}"
-
-# var_backup_storage: Storage location for backups (only used if var_backup=yes)
-#   Options: Storage name from /etc/pve/storage.cfg (e.g., "local", "nas-backup")
-#   Leave empty for interactive selection
-var_backup_storage="${var_backup_storage:-}"
-
-# var_container: Which containers to update
-#   Options:
-#     - "all"         : All containers with community-scripts tags
-#     - "all_running" : Only running containers with community-scripts tags
-#     - "all_stopped" : Only stopped containers with community-scripts tags
-#     - "101,102,109" : Comma-separated list of specific container IDs
-#     - ""            : Interactive selection via Whiptail
-var_container="${var_container:-}"
-
-# var_unattended: Run updates without user interaction inside containers
-#   Options: "yes" | "no" | "" (empty = interactive prompt)
-var_unattended="${var_unattended:-}"
-
-# var_skip_confirm: Skip initial confirmation dialog
-#   Options: "yes" | "no" (default: no)
-var_skip_confirm="${var_skip_confirm:-no}"
-
-# var_auto_reboot: Automatically reboot containers that require it after update
-#   Options: "yes" | "no" | "" (empty = interactive prompt)
-var_auto_reboot="${var_auto_reboot:-}"
-
-# var_tags: Optionally override the tags used for auto-detection
-#   Options: "community-script|proxmox-helper-scripts" (default)
-var_tags="${var_tags:-community-script|proxmox-helper-scripts}"
-# =============================================================================
-# JSON CONFIG EXPORT
-# Run with --export-config to output current configuration as JSON
-# =============================================================================
-
-function export_config_json() {
-  cat <<EOF
-{
-  "var_backup": "${var_backup}",
-  "var_backup_storage": "${var_backup_storage}",
-  "var_container": "${var_container}",
-  "var_unattended": "${var_unattended}",
-  "var_skip_confirm": "${var_skip_confirm}",
-  "var_auto_reboot": "${var_auto_reboot}",
-  "var_tags": "${var_tags}"
-}
-EOF
-}
-
-function print_usage() {
-  cat <<EOF
-Usage: $(basename "$0") [OPTIONS]
-
-Update LXC containers created with community-scripts.
-
-Options:
-  --help              Show this help message
-  --export-config     Export current configuration as JSON
-
-Environment Variables:
-  var_backup          Enable backup before update (yes/no)
-  var_backup_storage  Storage location for backups
-  var_container       Container selection (all/all_running/all_stopped/101,102,...)
-  var_unattended      Run updates unattended (yes/no)
-  var_skip_confirm    Skip initial confirmation (yes/no)
-  var_auto_reboot     Auto-reboot containers if required (yes/no)
-  var_tags            Optionally override auto-detection tags ("prod|smb|community-script")
-
-Examples:
-  # Run interactively
-  $(basename "$0")
-
-  # Update all running containers unattended with backup
-  var_backup=yes var_backup_storage=local var_container=all_running var_unattended=yes var_skip_confirm=yes $(basename "$0")
-
-  # Update specific containers without backup
-  var_backup=no var_container=101,102,105 var_unattended=yes var_skip_confirm=yes $(basename "$0")
-
-  # Export current configuration
-  $(basename "$0") --export-config
-EOF
-}
-
-# Handle command line arguments
-case "${1:-}" in
-  --help|-h)
-    print_usage
-    exit 0
-    ;;
-  --export-config)
-    export_config_json
-    exit 0
-    ;;
-esac
-
-# =============================================================================
-
-function header_info {
-  clear
-  cat <<"EOF"
-    __   _  ________   __  __          __      __
-   / /  | |/ / ____/  / / / /___  ____/ /___ _/ /____
-  / /   |   / /      / / / / __ \/ __  / __ `/ __/ _ \
- / /___/   / /___   / /_/ / /_/ / /_/ / /_/ / /_/  __/
-/_____/_/|_\____/   \____/ .___/\__,_/\__,_/\__/\___/
-                        /_/
-EOF
-}
-
-function detect_service() {
-  pushd $(mktemp -d) >/dev/null
-  pct pull "$1" /usr/bin/update update 2>/dev/null
-  service=$(cat update | sed 's|.*/ct/||g' | sed 's|\.sh).*||g')
-  popd >/dev/null
-}
-
-function backup_container() {
-  msg_info "Creating backup for container $1"
-  vzdump $1 --compress zstd --storage $STORAGE_CHOICE -notes-template "community-scripts backup updater" >/dev/null 2>&1
-  status=$?
-
-  if [ $status -eq 0 ]; then
-    msg_ok "Backup created"
-  else
-    msg_error "Backup failed for container $1"
-    exit 1
-  fi
-}
-
-function get_backup_storages() {
-  STORAGES=$(awk '
-/^[a-z]+:/ {
-    if (name != "") {
-        if (has_backup || (!has_content && type == "dir")) print name
-    }
-    split($0, a, ":")
-    type = a[1]
-    name = a[2]
-    sub(/^ +/, "", name)
-    has_content = 0
-    has_backup = 0
-}
-/^ +content/ {
-    has_content = 1
-    if ($0 ~ /backup/) has_backup = 1
-}
-END {
-    if (name != "") {
-        if (has_backup || (!has_content && type == "dir")) print name
-    }
-}
-' /etc/pve/storage.cfg)
-}
-
-header_info
-
-# Skip confirmation if var_skip_confirm is set to yes
-if [[ "$var_skip_confirm" != "yes" ]]; then
-  whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC App Update" --yesno "This will update apps in LXCs installed by Helper-Scripts. Proceed?" 10 58 || exit
-fi
-
-tags_formatted="${var_tags//|/, }"
-msg_info "Loading all possible LXC containers from Proxmox VE with tags: ${tags_formatted}. This may take a few seconds..."
-NODE=$(hostname)
-containers=$(pct list | tail -n +2 | awk '{print $0 " " $4}')
-
-if [ -z "$containers" ]; then
-  whiptail --title "LXC Container Update" --msgbox "No LXC containers available!" 10 60
-  exit 1
-fi
-
-menu_items=()
-FORMAT="%-10s %-15s %-10s"
-TAGS="${var_tags:-community-script|proxmox-helper-scripts}"
-
-while read -r container; do
-  container_id=$(echo $container | awk '{print $1}')
-  container_name=$(echo $container | awk '{print $2}')
-  container_status=$(echo $container | awk '{print $3}')
-  formatted_line=$(printf "$FORMAT" "$container_name" "$container_status")
-  if pct config "$container_id" | grep -qE "[^-][; ](${TAGS}).*"; then
-    menu_items+=("$container_id" "$formatted_line" "OFF")
-  fi
-done <<<"$containers"
-msg_ok "Loaded ${#menu_items[@]} containers"
-
-# Determine container selection based on var_container
-if [[ -n "$var_container" ]]; then
-  case "$var_container" in
-    all)
-      # Select all containers with matching tags
-      CHOICE=""
-      for ((i=0; i<${#menu_items[@]}; i+=3)); do
-        CHOICE="$CHOICE ${menu_items[$i]}"
-      done
-      CHOICE=$(echo "$CHOICE" | xargs)
-      ;;
-    all_running)
-      # Select only running containers with matching tags
-      CHOICE=""
-      for ((i=0; i<${#menu_items[@]}; i+=3)); do
-        cid="${menu_items[$i]}"
-        if pct status "$cid" 2>/dev/null | grep -q "running"; then
-          CHOICE="$CHOICE $cid"
-        fi
-      done
-      CHOICE=$(echo "$CHOICE" | xargs)
-      ;;
-    all_stopped)
-      # Select only stopped containers with matching tags
-      CHOICE=""
-      for ((i=0; i<${#menu_items[@]}; i+=3)); do
-        cid="${menu_items[$i]}"
-        if pct status "$cid" 2>/dev/null | grep -q "stopped"; then
-          CHOICE="$CHOICE $cid"
-        fi
-      done
-      CHOICE=$(echo "$CHOICE" | xargs)
-      ;;
-    *)
-      # Assume comma-separated list of container IDs
-      CHOICE=$(echo "$var_container" | tr ',' ' ')
-      ;;
-  esac
-
-  if [[ -z "$CHOICE" ]]; then
-    msg_error "No containers matched the selection criteria: $var_container ${var_tags:-community-script|proxmox-helper-scripts}"
-    exit 1
-  fi
-  msg_ok "Selected containers: $CHOICE"
-else
-  CHOICE=$(whiptail --title "LXC Container Update" \
-    --checklist "Select LXC containers to update:" 25 60 13 \
-    "${menu_items[@]}" 3>&2 2>&1 1>&3 | tr -d '"')
-
-  if [ -z "$CHOICE" ]; then
-    whiptail --title "LXC Container Update" \
-      --msgbox "No containers selected!" 10 60
-    exit 1
-  fi
-fi
-
-header_info
-
-# Determine backup choice based on var_backup
-if [[ -n "$var_backup" ]]; then
-  BACKUP_CHOICE="$var_backup"
-else
-  BACKUP_CHOICE="no"
-  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "Do you want to backup your containers before update?" 10 58); then
-    BACKUP_CHOICE="yes"
-  fi
-fi
-
-# Determine unattended update based on var_unattended
-if [[ -n "$var_unattended" ]]; then
-  UNATTENDED_UPDATE="$var_unattended"
-else
-  UNATTENDED_UPDATE="no"
-  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "Run updates unattended?" 10 58); then
-    UNATTENDED_UPDATE="yes"
-  fi
-fi
-
-if [ "$BACKUP_CHOICE" == "yes" ]; then
-  get_backup_storages
-
-  if [ -z "$STORAGES" ]; then
-    msg_error "No storage with 'backup' support found!"
-    exit 1
-  fi
-
-  # Determine storage based on var_backup_storage
-  if [[ -n "$var_backup_storage" ]]; then
-    # Validate that the specified storage exists and supports backups
-    if echo "$STORAGES" | grep -qw "$var_backup_storage"; then
-      STORAGE_CHOICE="$var_backup_storage"
-      msg_ok "Using backup storage: $STORAGE_CHOICE"
-    else
-      msg_error "Specified backup storage '$var_backup_storage' not found or doesn't support backups!"
-      msg_info "Available storages: $(echo $STORAGES | tr '\n' ' ')"
-      exit 1
-    fi
-  else
-    MENU_ITEMS=()
-    for STORAGE in $STORAGES; do
-      MENU_ITEMS+=("$STORAGE" "")
-    done
-
-    STORAGE_CHOICE=$(whiptail --title "Select storage device" --menu "Select a storage device (Only storage devices with 'backup' support are listed):" 15 50 5 "${MENU_ITEMS[@]}" 3>&1 1>&2 2>&3)
-
-    if [ -z "$STORAGE_CHOICE" ]; then
-      msg_error "No storage selected!"
-      exit 1
-    fi
-  fi
-fi
-
-UPDATE_CMD="update;"
-if [ "$UNATTENDED_UPDATE" == "yes" ]; then
-  UPDATE_CMD="export PHS_SILENT=1;update;"
-fi
-
-containers_needing_reboot=()
-for container in $CHOICE; do
-  echo -e "${BL}[INFO]${CL} Updating container $container"
-
-  if [ "$BACKUP_CHOICE" == "yes" ]; then
-    backup_container $container
-  fi
-
-  os=$(pct config "$container" | awk '/^ostype/ {print $2}')
-  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
-  fi
-
-  #1) Detect service using the service name in the update command
-  detect_service $container
-
-  #1.1) If update script not detected, return
-  if [ -z "${service}" ]; then
-    echo -e "${YW}[WARN]${CL} Update script not found. Skipping to next container"
-    continue
-  else
-    echo -e "${BL}[INFO]${CL} Detected service: ${GN}${service}${CL}"
-  fi
-
-  #2) Extract service build/update resource requirements from config/installation file
-  script=$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${service}.sh)
-
-  #2.1) Check if the script downloaded successfully
-  if [ $? -ne 0 ]; then
-    echo -e "${RD}[ERROR]${CL} Issue while downloading install script."
-    echo -e "${YW}[WARN]${CL} Unable to assess build resource requirements. Proceeding with current resources."
-  fi
-
-  config=$(pct config "$container")
-  build_cpu=$(echo "$script" | { grep -m 1 "var_cpu" || test $? = 1; } | sed 's|.*=||g' | sed 's|"||g' | sed 's|.*var_cpu:-||g' | sed 's|}||g')
-  build_ram=$(echo "$script" | { grep -m 1 "var_ram" || test $? = 1; } | sed 's|.*=||g' | sed 's|"||g' | sed 's|.*var_ram:-||g' | sed 's|}||g')
-  run_cpu=$(echo "$script" | { grep -m 1 "pct set \$CTID -cores" || test $? = 1; } | sed 's|.*cores ||g')
-  run_ram=$(echo "$script" | { grep -m 1 "pct set \$CTID -memory" || test $? = 1; } | sed 's|.*memory ||g')
-  current_cpu=$(echo "$config" | grep -m 1 "cores:" | sed 's|cores: ||g')
-  current_ram=$(echo "$config" | grep -m 1 "memory:" | sed 's|memory: ||g')
-
-  #Test if all values are valid (>0)
-  if [ -z "${run_cpu}" ] || [ "$run_cpu" -le 0 ]; then
-    #echo "No valid value found for run_cpu. Assuming same as current configuration."
-    run_cpu=$current_cpu
-  fi
-
-  if [ -z "${run_ram}" ] || [ "$run_ram" -le 0 ]; then
-    #echo "No valid value found for run_ram. Assuming same as current configuration."
-    run_ram=$current_ram
-  fi
-
-  if [ -z "${build_cpu}" ] || [ "$build_cpu" -le 0 ]; then
-    #echo "No valid value found for build_cpu. Assuming same as current configuration."
-    build_cpu=$current_cpu
-  fi
-
-  if [ -z "${build_ram}" ] || [ "$build_ram" -le 0 ]; then
-    #echo "No valid value found for build_ram. Assuming same as current configuration."
-    build_ram=$current_ram
-  fi
-
-  UPDATE_BUILD_RESOURCES=0
-  if [ "$build_cpu" -gt "$run_cpu" ] || [ "$build_ram" -gt "$run_ram" ]; then
-    UPDATE_BUILD_RESOURCES=1
-  fi
-
-  #3) if build resources are different than run resources, then:
-  if [ "$UPDATE_BUILD_RESOURCES" -eq "1" ]; then
-    pct set "$container" --cores "$build_cpu" --memory "$build_ram"
-  fi
-
-  #4) Update service, using the update command
-  case "$os" in
-  alpine) pct exec "$container" -- ash -c "$UPDATE_CMD" ;;
-  archlinux) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
-  fedora | rocky | centos | alma) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
-  ubuntu | debian | devuan) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
-  opensuse) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
-  esac
-  exit_code=$?
-
-  if [ "$template" == "false" ] && [ "$status" == "status: stopped" ]; then
-    echo -e "${BL}[Info]${GN} Shutting down${BL} $container ${CL} \n"
-    pct shutdown $container &
-  fi
-
-  #5) if build resources are different than run resources, then:
-  if [ "$UPDATE_BUILD_RESOURCES" -eq "1" ]; then
-    pct set "$container" --cores "$run_cpu" --memory "$run_ram"
-  fi
-
-  if pct exec "$container" -- [ -e "/var/run/reboot-required" ]; then
-    # Get the container's hostname and add it to the list
-    container_hostname=$(pct exec "$container" hostname)
-    containers_needing_reboot+=("$container ($container_hostname)")
-  fi
-
-  if [ $exit_code -eq 0 ]; then
-    msg_ok "Updated container $container"
-  elif [ "$BACKUP_CHOICE" == "yes" ]; then
-    msg_info "Restoring LXC from backup"
-    pct stop $container
-    LXC_STORAGE=$(pct config $container | awk -F '[:,]' '/rootfs/ {print $2}')
-    pct restore $container /var/lib/vz/dump/vzdump-lxc-${container}-*.tar.zst --storage $LXC_STORAGE --force >/dev/null 2>&1
-    pct start $container
-    restorestatus=$?
-    if [ $restorestatus -eq 0 ]; then
-      msg_ok "Restored LXC from backup"
-    else
-      msg_error "Restored LXC from backup failed"
-      exit 1
-    fi
-  else
-    msg_error "Update failed for container $container. Exiting"
-    exit 1
-  fi
-done
-
-wait
-header_info
-echo -e "${GN}The process is complete, and the containers have been successfully updated.${CL}\n"
-if [ "${#containers_needing_reboot[@]}" -gt 0 ]; then
-  echo -e "${RD}The following containers require a reboot:${CL}"
-  for container_name in "${containers_needing_reboot[@]}"; do
-    echo "$container_name"
-  done
-
-  # Determine reboot choice based on var_auto_reboot
-  REBOOT_CHOICE="no"
-  if [[ -n "$var_auto_reboot" ]]; then
-    REBOOT_CHOICE="$var_auto_reboot"
-  else
-    echo -ne "${INFO} Do you wish to reboot these containers? <yes/No>  "
-    read -r prompt
-    if [[ ${prompt,,} =~ ^(yes)$ ]]; then
-      REBOOT_CHOICE="yes"
-    fi
-  fi
-
-  if [[ "$REBOOT_CHOICE" == "yes" ]]; then
-    echo -e "${CROSS}${HOLD} ${YWB}Rebooting containers.${CL}"
-    for container_name in "${containers_needing_reboot[@]}"; do
-      container=$(echo $container_name | cut -d " " -f 1)
-      pct reboot ${container}
-    done
-  fi
-fi
--- a/vm/docker-vm.sh
+++ b/vm/docker-vm.sh
@@ -1,71 +1,45 @@
 #!/usr/bin/env bash

 # Copyright (c) 2021-2026 community-scripts ORG
-# Author: thost96 (thost96) | Co-Author: michelroegl-brunner
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Author: thost96 (thost96) | michelroegl-brunner | MickLesk
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE

-source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)
+# ==============================================================================
+# Docker VM - Creates a Docker-ready Virtual Machine
+# ==============================================================================

-function header_info() {
-  clear
-  cat <<"EOF"
-    ____             __                _    ____  ___
-   / __ \____  _____/ /_____  _____   | |  / /  |/  /
-  / / / / __ \/ ___/ //_/ _ \/ ___/   | | / / /|_/ /
- / /_/ / /_/ / /__/ ,< /  __/ /       | |/ / /  / /
-/_____/\____/\___/_/|_|\___/_/        |___/_/  /_/
+source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/api.func) 2>/dev/null
+source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/vm-core.func) 2>/dev/null
+source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/cloud-init.func) 2>/dev/null || true
+load_functions
+
+# ==============================================================================
+# SCRIPT VARIABLES
+# ==============================================================================
+APP="Docker"
+APP_TYPE="vm"
+NSAPP="docker-vm"
+var_os="debian"
+var_version="13"

-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=""
-NSAPP="docker-vm"
-var_os="debian"
-var_version="12"
 DISK_SIZE="10G"
-
-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}"
-
+USE_CLOUD_INIT="no"
+OS_TYPE=""
+OS_VERSION=""
 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"
@@ -76,140 +50,96 @@ 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
+# ==============================================================================
+# 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 \
+    "debian13" "Debian 13 (Trixie) - Latest" ON \
+    "debian12" "Debian 12 (Bookworm) - Stable" OFF \
+    "ubuntu2404" "Ubuntu 24.04 LTS (Noble)" OFF \
+    "ubuntu2204" "Ubuntu 22.04 LTS (Jammy)" OFF \
+    3>&1 1>&2 2>&3); then
+    case $OS_CHOICE in
+    debian13)
+      OS_TYPE="debian"
+      OS_VERSION="13"
+      OS_CODENAME="trixie"
+      OS_DISPLAY="Debian 13 (Trixie)"
+      ;;
+    debian12)
+      OS_TYPE="debian"
+      OS_VERSION="12"
+      OS_CODENAME="bookworm"
+      OS_DISPLAY="Debian 12 (Bookworm)"
+      ;;
+    ubuntu2404)
+      OS_TYPE="ubuntu"
+      OS_VERSION="24.04"
+      OS_CODENAME="noble"
+      OS_DISPLAY="Ubuntu 24.04 LTS"
+      ;;
+    ubuntu2204)
+      OS_TYPE="ubuntu"
+      OS_VERSION="22.04"
+      OS_CODENAME="jammy"
+      OS_DISPLAY="Ubuntu 22.04 LTS"
+      ;;
+    esac
+    echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}${OS_DISPLAY}${CL}"
+  else
+    exit_script
+  fi
+}
+
+function select_cloud_init() {
+  if [ "$OS_TYPE" = "ubuntu" ]; then
+    USE_CLOUD_INIT="yes"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes (Ubuntu requires Cloud-Init)${CL}"
+    return
+  fi
+
+  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:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}"
+  else
+    USE_CLOUD_INIT="no"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}"
+  fi
+}
+
+function get_image_url() {
+  local arch=$(dpkg --print-architecture)
+  case $OS_TYPE in
+  debian)
+    if [ "$USE_CLOUD_INIT" = "yes" ]; then
+      echo "https://cloud.debian.org/images/cloud/${OS_CODENAME}/latest/debian-${OS_VERSION}-generic-${arch}.qcow2"
+    else
+      echo "https://cloud.debian.org/images/cloud/${OS_CODENAME}/latest/debian-${OS_VERSION}-nocloud-${arch}.qcow2"
    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 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, 9.0 and 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
-    return 0
-  fi
-
-  # Check for Proxmox VE 9.x: allow 9.0 and 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 supported."
-      msg_error "Supported: Proxmox VE version 9.0 – 9.1"
-      exit 1
-    fi
-    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
+    ;;
+  ubuntu)
+    echo "https://cloud-images.ubuntu.com/${OS_CODENAME}/current/${OS_CODENAME}-server-cloudimg-${arch}.img"
+    ;;
+  esac
 }

+# ==============================================================================
+# SETTINGS FUNCTIONS
+# ==============================================================================
 function default_settings() {
+  select_os
+  select_cloud_init
+
  VMID=$(get_valid_nextid)
-  FORMAT=",efitype=4m"
-  MACHINE=""
+  FORMAT=""
+  MACHINE=" -machine q35"
  DISK_CACHE=""
  DISK_SIZE="10G"
  HN="docker"
-  CPU_TYPE=""
+  CPU_TYPE=" -cpu host"
  CORE_COUNT="2"
  RAM_SIZE="4096"
  BRG="vmbr0"
@@ -218,12 +148,13 @@ function default_settings() {
  MTU=""
  START_VM="yes"
  METHOD="default"
+
  echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
-  echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx${CL}"
+  echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}"
  echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}"
-  echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}"
+  echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
  echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}${CL}"
  echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}${BRG}${CL}"
@@ -231,12 +162,22 @@ function default_settings() {
  echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}Default${CL}"
  echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}Default${CL}"
  echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
-  echo -e "${CREATING}${BOLD}${DGN}Creating a Docker VM using the above default settings${CL}"
+  echo -e "${CREATING}${BOLD}${DGN}Creating a Docker VM using the above settings${CL}"
 }

 function advanced_settings() {
+  select_os
+  select_cloud_init
+
+  # SSH Key selection for Cloud-Init VMs
+  if [ "$USE_CLOUD_INIT" = "yes" ]; then
+    configure_cloudinit_ssh_keys || true
+  fi
+
  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
@@ -250,27 +191,29 @@ 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 \
-    "i440fx" "Machine i440fx" ON \
-    "q35" "Machine q35" OFF \
+    "q35" "Q35 (Modern, PCIe)" ON \
+    "i440fx" "i440fx (Legacy, PCI)" OFF \
    3>&1 1>&2 2>&3); then
    if [ $MACH = q35 ]; then
-      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}$MACH${CL}"
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
      FORMAT=""
      MACHINE=" -machine q35"
    else
-      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}$MACH${CL}"
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx (Legacy)${CL}"
      FORMAT=",efitype=4m"
      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
@@ -280,12 +223,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 \
@@ -298,24 +242,25 @@ 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 \
-    "0" "KVM64 (Default)" ON \
-    "1" "Host" OFF \
+    "1" "Host (Recommended)" ON \
+    "0" "KVM64" OFF \
    3>&1 1>&2 2>&3); then
    if [ $CPU_TYPE1 = "1" ]; then
      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
@@ -325,80 +270,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"
@@ -407,6 +350,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
@@ -427,13 +371,28 @@ function start_script() {
    advanced_settings
  fi
 }
+
+# ==============================================================================
+# MAIN EXECUTION
+# ==============================================================================
+header_info
+
 check_root
 arch_check
 pve_check
-ssh_check
+
+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}')
@@ -446,6 +405,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."
@@ -453,6 +413,8 @@ if [ -z "$VALID" ]; then
 elif [ $((${#STORAGE_MENU[@]} / 3)) -eq 1 ]; then
  STORAGE=${STORAGE_MENU[0]}
 else
+  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
+  printf "\e[?25h"
  while [ -z "${STORAGE:+x}" ]; do
    STORAGE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Storage Pools" --radiolist \
      "Which storage pool would you like to use for ${HN}?\nTo make a selection, use the Spacebar.\n" \
@@ -462,112 +424,288 @@ else
 fi
 msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
 msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
-msg_info "Retrieving the URL for the Debian 12 Qcow2 Disk Image"
-URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-nocloud-$(dpkg --print-architecture).qcow2"
-sleep 2
-msg_ok "${CL}${BL}${URL}${CL}"
-curl -f#SL -o "$(basename "$URL")" "$URL"
-echo -en "\e[1A\e[0K"
-FILE=$(basename $URL)
-msg_ok "Downloaded ${CL}${BL}${FILE}${CL}"

+# ==============================================================================
+# PREREQUISITES
+# ==============================================================================
+if ! command -v virt-customize &>/dev/null; then
+  msg_info "Installing libguestfs-tools"
+  apt-get -qq update >/dev/null
+  apt-get -qq install libguestfs-tools lsb-release -y >/dev/null
+  apt-get -qq install dhcpcd-base -y >/dev/null 2>&1 || true
+  msg_ok "Installed libguestfs-tools"
+fi
+
+# ==============================================================================
+# IMAGE DOWNLOAD
+# ==============================================================================
+msg_info "Retrieving the URL for the ${OS_DISPLAY} Qcow2 Disk Image"
+URL=$(get_image_url)
+CACHE_DIR="/var/lib/vz/template/cache"
+CACHE_FILE="$CACHE_DIR/$(basename "$URL")"
+mkdir -p "$CACHE_DIR"
+msg_ok "${CL}${BL}${URL}${CL}"
+
+if [[ ! -s "$CACHE_FILE" ]]; then
+  curl -f#SL -o "$CACHE_FILE" "$URL"
+  echo -en "\e[1A\e[0K"
+  msg_ok "Downloaded ${CL}${BL}$(basename "$CACHE_FILE")${CL}"
+else
+  msg_ok "Using cached image ${CL}${BL}$(basename "$CACHE_FILE")${CL}"
+fi
+
+# ==============================================================================
+# STORAGE TYPE DETECTION
+# ==============================================================================
 STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}')
 case $STORAGE_TYPE in
 nfs | dir)
  DISK_EXT=".qcow2"
  DISK_REF="$VMID/"
-  DISK_IMPORT="-format qcow2"
+  DISK_IMPORT="--format qcow2"
  THIN=""
  ;;
 btrfs)
  DISK_EXT=".raw"
  DISK_REF="$VMID/"
-  DISK_IMPORT="-format raw"
+  DISK_IMPORT="--format raw"
  FORMAT=",efitype=4m"
  THIN=""
  ;;
+*)
+  DISK_EXT=""
+  DISK_REF=""
+  DISK_IMPORT="--format raw"
+  ;;
 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}
+
+# ==============================================================================
+# IMAGE CUSTOMIZATION WITH DOCKER
+# ==============================================================================
+msg_info "Preparing ${OS_DISPLAY} image with Docker"
+
+WORK_FILE=$(mktemp --suffix=.qcow2)
+cp "$CACHE_FILE" "$WORK_FILE"
+
+export LIBGUESTFS_BACKEND_SETTINGS=dns=8.8.8.8,1.1.1.1
+
+DOCKER_PREINSTALLED="no"
+
+# Install qemu-guest-agent and Docker during image customization
+msg_info "Installing base packages in image"
+if virt-customize -a "$WORK_FILE" --install qemu-guest-agent,curl,ca-certificates >/dev/null 2>&1; then
+  msg_ok "Installed base packages"
+
+  msg_info "Installing Docker (this may take 2-5 minutes)"
+  if virt-customize -q -a "$WORK_FILE" --run-command "curl -fsSL https://get.docker.com | sh" >/dev/null 2>&1 &&
+    virt-customize -q -a "$WORK_FILE" --run-command "systemctl enable docker" >/dev/null 2>&1; then
+    msg_ok "Installed Docker"
+
+    msg_info "Configuring Docker daemon"
+    # Optimize Docker daemon configuration
+    virt-customize -q -a "$WORK_FILE" --run-command "mkdir -p /etc/docker" >/dev/null 2>&1
+    virt-customize -q -a "$WORK_FILE" --run-command 'cat > /etc/docker/daemon.json << EOF
+{
+  "storage-driver": "overlay2",
+  "log-driver": "json-file",
+  "log-opts": {
+    "max-size": "10m",
+    "max-file": "3"
+  }
+}
+EOF' >/dev/null 2>&1
+    DOCKER_PREINSTALLED="yes"
+    msg_ok "Configured Docker daemon"
+  else
+    msg_ok "Docker will be installed on first boot"
+  fi
+else
+  msg_ok "Packages will be installed on first boot"
+fi
+
+msg_info "Finalizing image (hostname, SSH config)"
+# Set hostname and prepare for unique machine-id
+virt-customize -q -a "$WORK_FILE" --hostname "${HN}" >/dev/null 2>&1
+virt-customize -q -a "$WORK_FILE" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1
+virt-customize -q -a "$WORK_FILE" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1
+
+# Configure SSH for Cloud-Init
+if [ "$USE_CLOUD_INIT" = "yes" ]; then
+  virt-customize -q -a "$WORK_FILE" --run-command "sed -i 's/^#*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true
+  virt-customize -q -a "$WORK_FILE" --run-command "sed -i 's/^#*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true
+else
+  # Configure auto-login for nocloud images (no Cloud-Init)
+  virt-customize -q -a "$WORK_FILE" --run-command "mkdir -p /etc/systemd/system/serial-getty@ttyS0.service.d" >/dev/null 2>&1 || true
+  virt-customize -q -a "$WORK_FILE" --run-command 'cat > /etc/systemd/system/serial-getty@ttyS0.service.d/autologin.conf << EOF
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --autologin root --noclear %I \$TERM
+EOF' >/dev/null 2>&1 || true
+  virt-customize -q -a "$WORK_FILE" --run-command "mkdir -p /etc/systemd/system/getty@tty1.service.d" >/dev/null 2>&1 || true
+  virt-customize -q -a "$WORK_FILE" --run-command 'cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --autologin root --noclear %I \$TERM
+EOF' >/dev/null 2>&1 || true
+fi
+msg_ok "Finalized image"
+
+# Create first-boot Docker install script (fallback if virt-customize failed)
+if [ "$DOCKER_PREINSTALLED" = "no" ]; then
+  virt-customize -q -a "$WORK_FILE" --run-command 'cat > /root/install-docker.sh << "DOCKERSCRIPT"
+#!/bin/bash
+exec > /var/log/install-docker.log 2>&1
+echo "[$(date)] Starting Docker installation"
+
+for i in {1..30}; do
+  ping -c 1 8.8.8.8 >/dev/null 2>&1 && break
+  sleep 2
 done

-if ! command -v virt-customize &>/dev/null; then
-  msg_info "Installing Pre-Requisite libguestfs-tools onto Host"
-  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"
+apt-get update
+apt-get install -y qemu-guest-agent curl ca-certificates
+curl -fsSL https://get.docker.com | sh
+systemctl enable docker
+systemctl start docker
+
+mkdir -p /etc/docker
+cat > /etc/docker/daemon.json << DAEMON
+{
+  "storage-driver": "overlay2",
+  "log-driver": "json-file",
+  "log-opts": { "max-size": "10m", "max-file": "3" }
+}
+DAEMON
+systemctl restart docker
+
+touch /root/.docker-installed
+echo "[$(date)] Docker installation completed"
+DOCKERSCRIPT
+chmod +x /root/install-docker.sh' >/dev/null 2>&1
+
+  virt-customize -q -a "$WORK_FILE" --run-command 'cat > /etc/systemd/system/install-docker.service << "DOCKERSERVICE"
+[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
+DOCKERSERVICE
+systemctl enable install-docker.service' >/dev/null 2>&1
 fi

-msg_info "Adding Docker and Docker Compose Plugin to Debian 12 Qcow2 Disk Image"
-virt-customize -q -a "${FILE}" --install qemu-guest-agent,apt-transport-https,ca-certificates,curl,gnupg,software-properties-common,lsb-release >/dev/null &&
-  virt-customize -q -a "${FILE}" --run-command "mkdir -p /etc/apt/keyrings && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg" >/dev/null &&
-  virt-customize -q -a "${FILE}" --run-command "echo 'deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable' > /etc/apt/sources.list.d/docker.list" >/dev/null &&
-  virt-customize -q -a "${FILE}" --run-command "apt-get update -qq && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin" >/dev/null &&
-  virt-customize -q -a "${FILE}" --run-command "systemctl enable docker" >/dev/null &&
-  virt-customize -q -a "${FILE}" --hostname "${HN}" >/dev/null &&
-  virt-customize -q -a "${FILE}" --run-command "echo -n > /etc/machine-id" >/dev/null
-msg_ok "Added Docker and Docker Compose Plugin to Debian 12 Qcow2 Disk Image successfully"
+# Resize disk to target size
+msg_info "Resizing disk image to ${DISK_SIZE}"
+qemu-img resize "$WORK_FILE" "${DISK_SIZE}" >/dev/null 2>&1
+msg_ok "Resized disk image"

-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 --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"
+# ==============================================================================
+# VM CREATION
+# ==============================================================================
+msg_info "Creating Docker VM shell"

-msg_info "Creating a 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 \
-  -efidisk0 ${DISK0_REF}${FORMAT} \
-  -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
-  -boot order=scsi0 \
-  -serial0 socket >/dev/null
-qm resize $VMID scsi0 8G >/dev/null
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci >/dev/null
+
+msg_ok "Created VM shell"
+
+# ==============================================================================
+# DISK IMPORT
+# ==============================================================================
+msg_info "Importing disk into storage ($STORAGE)"
+
+if qm disk import --help >/dev/null 2>&1; then
+  IMPORT_CMD=(qm disk import)
+else
+  IMPORT_CMD=(qm importdisk)
+fi
+
+IMPORT_OUT="$("${IMPORT_CMD[@]}" "$VMID" "$WORK_FILE" "$STORAGE" ${DISK_IMPORT:-} 2>&1 || true)"
+DISK_REF_IMPORTED="$(printf '%s\n' "$IMPORT_OUT" | sed -n "s/.*successfully imported disk '\([^']\+\)'.*/\1/p" | tr -d "\r\"'")"
+[[ -z "$DISK_REF_IMPORTED" ]] && DISK_REF_IMPORTED="$(pvesm list "$STORAGE" | awk -v id="$VMID" '$5 ~ ("vm-"id"-disk-") {print $1":"$5}' | sort | tail -n1)"
+[[ -z "$DISK_REF_IMPORTED" ]] && {
+  msg_error "Unable to determine imported disk reference."
+  echo "$IMPORT_OUT"
+  exit 1
+}
+
+msg_ok "Imported disk (${CL}${BL}${DISK_REF_IMPORTED}${CL})"
+
+# Clean up work file
+rm -f "$WORK_FILE"
+
+# ==============================================================================
+# VM CONFIGURATION
+# ==============================================================================
+msg_info "Attaching EFI and root disk"
+
+qm set "$VMID" \
+  --efidisk0 "${STORAGE}:0,efitype=4m" \
+  --scsi0 "${DISK_REF_IMPORTED},${DISK_CACHE}${THIN%,}" \
+  --boot order=scsi0 \
+  --serial0 socket >/dev/null
+
 qm set $VMID --agent enabled=1 >/dev/null

-DESCRIPTION=$(
-  cat <<EOF
-<div align='center'>
-  <a href='https://Helper-Scripts.com' target='_blank' rel='noopener noreferrer'>
-    <img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
-  </a>
+msg_ok "Attached EFI and root disk"

-  <h2 style='font-size: 24px; margin: 20px 0;'>Docker VM</h2>
+# Set VM description
+set_description

-  <p style='margin: 16px 0;'>
-    <a href='https://ko-fi.com/community_scripts' target='_blank' rel='noopener noreferrer'>
-      <img src='https://img.shields.io/badge/&#x2615;-Buy us a coffee-blue' alt='spend Coffee' />
-    </a>
-  </p>
+# Cloud-Init configuration
+if [ "$USE_CLOUD_INIT" = "yes" ]; then
+  msg_info "Configuring Cloud-Init"
+  setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes"
+  msg_ok "Cloud-Init configured"
+fi

-  <span style='margin: 0 10px;'>
-    <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
-  </span>
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a>
-  </span>
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a>
-  </span>
-</div>
-EOF
-)
-qm set $VMID -description "$DESCRIPTION" >/dev/null
-
-msg_ok "Created a Docker VM ${CL}${BL}(${HN})"
+# Start VM
 if [ "$START_VM" == "yes" ]; then
  msg_info "Starting Docker VM"
-  qm start $VMID
+  qm start $VMID >/dev/null 2>&1
  msg_ok "Started Docker VM"
 fi
+
+# ==============================================================================
+# FINAL OUTPUT
+# ==============================================================================
+VM_IP=""
+if [ "$START_VM" == "yes" ]; then
+  set +e
+  for i in {1..10}; 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) || true
+    [ -n "$VM_IP" ] && break
+    sleep 3
+  done
+  set -e
+fi
+
+echo -e "\n${INFO}${BOLD}${GN}Docker 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}"
+[ -n "$VM_IP" ] && echo -e "${TAB}${DGN}IP Address: ${BGN}${VM_IP}${CL}"
+
+if [ "$DOCKER_PREINSTALLED" = "yes" ]; then
+  echo -e "${TAB}${DGN}Docker: ${BGN}Pre-installed (via get.docker.com)${CL}"
+else
+  echo -e "${TAB}${DGN}Docker: ${BGN}Installing on first boot${CL}"
+  echo -e "${TAB}${YW}⚠️  Wait 2-3 minutes for installation to complete${CL}"
+  echo -e "${TAB}${YW}⚠️  Check progress: ${BL}cat /var/log/install-docker.log${CL}"
+fi
+
+if [ "$USE_CLOUD_INIT" = "yes" ]; then
+  display_cloud_init_info "$VMID" "$HN" 2>/dev/null || true
+fi
+
 post_update_to_api "done" "none"
 msg_ok "Completed successfully!\n"
Author	SHA1	Message	Date
MickLesk	fc5bad45b2	add cloudinit function	2026-02-04 20:30:37 +01:00
CanbiZ (MickLesk)	209706aceb	Merge branch 'main' into docker_deb13	2026-02-04 09:33:20 +01:00
CanbiZ (MickLesk)	b3b66b9ee7	Update fmt.Println message from 'Hello' to 'Goodbye'	2026-02-04 09:32:22 +01:00
CanbiZ	e8b021a524	Update docker-vm.sh	2025-11-11 14:52:09 +01:00
CanbiZ	e629ff5427	Update URL for Debian Qcow2 Disk Image	2025-11-11 09:37:01 +01:00
CanbiZ	000dc9a068	Upgrade to Debian 13 and clean up dependencies Updated the script to use Debian 13 Qcow2 Disk Image and removed redundant installation of libguestfs-tools.	2025-11-11 09:33:38 +01:00