fix：整体优化

Author: spiritLHLS

CHANGELOG.md

@@ -1,3 +1,8 @@
+2026.06.02
+- 统一无交互入口：安装、批量创建、卸载脚本均支持 `export noninteractive=true`，并在无交互模式下使用清晰默认值避免 stdin 阻塞
+- 批量创建脚本新增环境变量覆盖：`CONTAINERD_CREATE_COUNT`、`CONTAINERD_CONTAINER_MEMORY`、`CONTAINERD_CONTAINER_CPU`、`CONTAINERD_CONTAINER_DISK`、`CONTAINERD_CONTAINER_SYSTEM`、`CONTAINERD_CONTAINER_IPV6`
+- 优化批量创建日志展示，使用一次 shell 字段解析替代每行多次 `awk` 调用，避免不必要的重复外部命令
+
 2026.03.02
 - 修复容器创建后未正确配置 NAT 到宿主机公网 IP 的问题：在 containerdinstall.sh 新增 setup_iptables_nat() 函数，显式添加 IPv4 MASQUERADE 和 FORWARD 规则（基于子网而非网桥接口，避免接口未创建时规则失效）
 - 修复 adapt_ipv6() 仅配置 sysctl 而缺少 ip6tables FORWARD 规则的问题：新增 ip6tables FORWARD 规则允许 ctn-br1 和 IPv6 子网双向流量

README.md

@@ -19,6 +19,24 @@
 bash <(wget -qO- https://raw.githubusercontent.com/oneclickvirt/containerd/main/containerdinstall.sh)
 ```
 
+无交互安装统一使用：
+
+```bash
+export noninteractive=true
+bash <(wget -qO- https://raw.githubusercontent.com/oneclickvirt/containerd/main/containerdinstall.sh)
+```
+
+可配合环境变量覆盖默认值：
+
+```bash
+export noninteractive=true
+export NEED_DISK_LIMIT=y
+export CONTAINERD_POOL_SIZE=20
+export CONTAINERD_INSTALL_PATH=/var/lib/containerd
+export CONTAINERD_LOOP_FILE=/opt/containerd-pool.img
+bash <(wget -qO- https://raw.githubusercontent.com/oneclickvirt/containerd/main/containerdinstall.sh)
+```
+
 ## 开设单个容器
 
 ```bash
@@ -58,6 +76,19 @@ chmod +x create_containerd.sh
 
 交互式脚本，自动递增容器名（ct1, ct2, ...）、SSH 端口、公网端口，容器信息记录到 `ctlog` 文件。
 
+无交互批量开设统一使用：
+
+```bash
+export noninteractive=true
+export CONTAINERD_CREATE_COUNT=1
+export CONTAINERD_CONTAINER_MEMORY=512
+export CONTAINERD_CONTAINER_CPU=1
+export CONTAINERD_CONTAINER_DISK=0
+export CONTAINERD_CONTAINER_SYSTEM=debian
+export CONTAINERD_CONTAINER_IPV6=n
+./create_containerd.sh
+```
+
 ## 查看与管理容器
 
 ```bash
@@ -80,6 +111,13 @@ bash <(wget -qO- https://raw.githubusercontent.com/oneclickvirt/containerd/main/
 
 脚本会在执行前要求输入 `yes` 确认，操作不可逆。
 
+无交互卸载统一使用：
+
+```bash
+export noninteractive=true
+bash <(wget -qO- https://raw.githubusercontent.com/oneclickvirt/containerd/main/containerduninstall.sh)
+```
+
 ## 镜像说明
 
 本仓库自编镜像通过 GitHub Actions 构建并发布到 Releases：
@@ -102,4 +140,3 @@ bash <(wget -qO- https://raw.githubusercontent.com/oneclickvirt/containerd/main/
 ## Stargazers over time
 
 [![Stargazers over time](https://starchart.cc/oneclickvirt/containerd.svg)](https://starchart.cc/oneclickvirt/containerd)
-

containerdinstall.sh

@@ -4,13 +4,16 @@
 # 2026.03.01
 #
 # Supported environment variables (non-interactive mode / 支持的环境变量，可实现无交互安装):
+#   noninteractive=true          - Use defaults for prompts / 使用默认值跳过交互提示
 #   WITHOUTCDN=TRUE             - Disable CDN acceleration / 禁用 CDN 加速
 #   NEED_DISK_LIMIT=y           - Enable container disk size limitation (btrfs) / 启用容器磁盘大小限制 (btrfs)；默认: n
 #   CONTAINERD_INSTALL_PATH=    - containerd data root path / containerd 数据根路径；默认: /var/lib/containerd
-#   CONTAINERD_POOL_SIZE=20     - Storage pool size in GB / 存储池大小（GB），NEED_DISK_LIMIT=y 时必填
+#   CONTAINERD_POOL_SIZE=20     - Storage pool size in GB / 存储池大小（GB），NEED_DISK_LIMIT=y 时默认: 20
 #   CONTAINERD_LOOP_FILE=       - Loop file path / 循环文件路径；默认: /opt/containerd-pool.img
 #
 # Example / 示例:
+#   export noninteractive=true
+#   bash containerdinstall.sh
 #   NEED_DISK_LIMIT=y CONTAINERD_POOL_SIZE=20 bash containerdinstall.sh
 #   CONTAINERD_INSTALL_PATH=/data/containerd bash containerdinstall.sh
 
@@ -19,6 +22,21 @@ _green() { echo -e "\033[32m\033[01m$*\033[0m"; }
 _yellow() { echo -e "\033[33m\033[01m$*\033[0m"; }
 _blue() { echo -e "\033[36m\033[01m$*\033[0m"; }
 reading() { read -rp "$(_green "$1")" "$2"; }
+is_noninteractive() {
+    case "$(printf '%s' "${noninteractive:-}" | tr '[:upper:]' '[:lower:]')" in
+        true|yes|y|1) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+is_yes() {
+    case "$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]')" in
+        y|yes|true|1) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+DEFAULT_CONTAINERD_INSTALL_PATH="/var/lib/containerd"
+DEFAULT_CONTAINERD_POOL_SIZE="20"
+DEFAULT_CONTAINERD_LOOP_FILE="/opt/containerd-pool.img"
 export DEBIAN_FRONTEND=noninteractive
 utf8_locale=$(locale -a 2>/dev/null | grep -i -m 1 -E "UTF-8|utf8")
 if [[ -z "$utf8_locale" ]]; then
@@ -995,6 +1013,9 @@ main() {
     if [[ -n "${NEED_DISK_LIMIT:-}" ]]; then
         need_disk_limit_input="${NEED_DISK_LIMIT}"
         _blue "[non-interactive] NEED_DISK_LIMIT=${NEED_DISK_LIMIT}"
+    elif is_noninteractive; then
+        need_disk_limit_input="n"
+        _blue "[non-interactive] noninteractive=true, NEED_DISK_LIMIT defaulting to n"
     else
         _green "Do you need containerd with container disk size limitation? (Support btrfs snapshotter)"
         _green "是否需要支持容器硬盘大小限制的 containerd 环境？（使用 btrfs 快照器）"
@@ -1009,18 +1030,21 @@ main() {
     if [[ -n "${CONTAINERD_INSTALL_PATH:-}" ]]; then
         containerd_install_path="${CONTAINERD_INSTALL_PATH}"
         _blue "[non-interactive] CONTAINERD_INSTALL_PATH=${CONTAINERD_INSTALL_PATH}"
+    elif is_noninteractive; then
+        containerd_install_path="$DEFAULT_CONTAINERD_INSTALL_PATH"
+        _blue "[non-interactive] noninteractive=true, CONTAINERD_INSTALL_PATH defaulting to ${containerd_install_path}"
     else
-        _green "Where do you want to install containerd? (Enter to default: /var/lib/containerd):"
-        reading "containerd 安装路径？（回车则默认：/var/lib/containerd）：" containerd_install_path
+        _green "Where do you want to install containerd? (Enter to default: ${DEFAULT_CONTAINERD_INSTALL_PATH}):"
+        reading "containerd 安装路径？（回车则默认：${DEFAULT_CONTAINERD_INSTALL_PATH}）：" containerd_install_path
         if [ -z "$containerd_install_path" ]; then
-            containerd_install_path="/var/lib/containerd"
+            containerd_install_path="$DEFAULT_CONTAINERD_INSTALL_PATH"
         fi
     fi
     echo "$containerd_install_path" > /usr/local/bin/containerd_install_path
 
     containerd_pool_size=""
     containerd_loop_file=""
-    if [ "$need_disk_limit_input" = "y" ] || [ "$need_disk_limit_input" = "Y" ]; then
+    if is_yes "$need_disk_limit_input"; then
         echo "true" > /usr/local/bin/containerd_need_disk_limit
         # 存储池大小（支持环境变量 CONTAINERD_POOL_SIZE）
         if [[ -n "${CONTAINERD_POOL_SIZE:-}" ]]; then
@@ -1031,6 +1055,9 @@ main() {
                 _red "Invalid CONTAINERD_POOL_SIZE='${CONTAINERD_POOL_SIZE}', must be a positive integer."
                 exit 1
             fi
+        elif is_noninteractive; then
+            containerd_pool_size="$DEFAULT_CONTAINERD_POOL_SIZE"
+            _blue "[non-interactive] noninteractive=true, CONTAINERD_POOL_SIZE defaulting to ${containerd_pool_size}"
         else
             while true; do
                 _green "How large a containerd storage pool is needed? (unit: GB, e.g., enter 20 for 20G):"
@@ -1047,11 +1074,14 @@ main() {
         if [[ -n "${CONTAINERD_LOOP_FILE:-}" ]]; then
             containerd_loop_file="${CONTAINERD_LOOP_FILE}"
             _blue "[non-interactive] CONTAINERD_LOOP_FILE=${CONTAINERD_LOOP_FILE}"
+        elif is_noninteractive; then
+            containerd_loop_file="$DEFAULT_CONTAINERD_LOOP_FILE"
+            _blue "[non-interactive] noninteractive=true, CONTAINERD_LOOP_FILE defaulting to ${containerd_loop_file}"
         else
-            _green "Where do you want to store the containerd loop file? (Enter to default: /opt/containerd-pool.img):"
-            reading "containerd 循环文件存储位置？（回车则默认：/opt/containerd-pool.img）：" containerd_loop_file
+            _green "Where do you want to store the containerd loop file? (Enter to default: ${DEFAULT_CONTAINERD_LOOP_FILE}):"
+            reading "containerd 循环文件存储位置？（回车则默认：${DEFAULT_CONTAINERD_LOOP_FILE}）：" containerd_loop_file
             if [ -z "$containerd_loop_file" ]; then
-                containerd_loop_file="/opt/containerd-pool.img"
+                containerd_loop_file="$DEFAULT_CONTAINERD_LOOP_FILE"
             fi
         fi
     else
@@ -1128,4 +1158,3 @@ main() {
 }
 
 main "$@"
-

containerduninstall.sh

@@ -5,15 +5,30 @@
 # 完整卸载 containerd 环境及所有容器
 #
 # Supported environment variables (non-interactive mode / 支持的环境变量，可实现无交互卸载):
+#   noninteractive=true          - Skip confirmation prompt / 跳过确认提示直接卸载
 #   CONFIRM_UNINSTALL=yes       - Skip confirmation prompt / 跳过确认提示直接卸载
 #
 # Example / 示例:
+#   export noninteractive=true
+#   bash containerduninstall.sh
 #   CONFIRM_UNINSTALL=yes bash containerduninstall.sh
 
 _red()    { echo -e "\033[31m\033[01m$*\033[0m"; }
 _green()  { echo -e "\033[32m\033[01m$*\033[0m"; }
 _yellow() { echo -e "\033[33m\033[01m$*\033[0m"; }
 _blue()   { echo -e "\033[36m\033[01m$*\033[0m"; }
+is_noninteractive() {
+    case "$(printf '%s' "${noninteractive:-}" | tr '[:upper:]' '[:lower:]')" in
+        true|yes|y|1) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+is_yes() {
+    case "$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]')" in
+        y|yes|true|1) return 0 ;;
+        *) return 1 ;;
+    esac
+}
 
 if [ "$(id -u)" != "0" ]; then
     _red "This script must be run as root"
@@ -27,7 +42,10 @@ echo "  包含：所有运行中/停止的容器、所有镜像、"
 echo "  CNI 网络、systemd 服务、nerdctl/containerd 二进制"
 echo "  操作不可逆！"
 echo "======================================================"
-if [[ "${CONFIRM_UNINSTALL:-}" == "yes" ]]; then
+if is_noninteractive; then
+    confirm="yes"
+    _blue "[non-interactive] noninteractive=true, proceeding with uninstall..."
+elif is_yes "${CONFIRM_UNINSTALL:-}"; then
     confirm="yes"
     _blue "[non-interactive] CONFIRM_UNINSTALL=yes, proceeding with uninstall..."
 else