From 73e39f7ee806a737bc96cbf8131e7cb6e6b408b2 Mon Sep 17 00:00:00 2001 From: spiritsoul <97792170+spiritysdx@users.noreply.github.com> Date: Tue, 10 Mar 2026 08:12:53 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guide/containerd/containerd_precheck.md | 18 +----------- docs/en/guide/podman/podman_precheck.md | 21 +------------- docs/guide/containerd/containerd_precheck.md | 26 +---------------- docs/guide/podman/podman_precheck.md | 29 +------------------ 4 files changed, 4 insertions(+), 90 deletions(-) diff --git a/docs/en/guide/containerd/containerd_precheck.md b/docs/en/guide/containerd/containerd_precheck.md index b61c993e0e..f729c0aac9 100644 --- a/docs/en/guide/containerd/containerd_precheck.md +++ b/docs/en/guide/containerd/containerd_precheck.md @@ -43,20 +43,4 @@ Bulk or individual NAT server provisioning based on containerd + nerdctl runtime - Kernel must support overlay filesystem - Network must be able to connect to GitHub raw interface - At least 3GB free disk space -- **No KVM hardware support required** - -## Comparison with Docker - -| Feature | containerd | docker | -|---------|-----------|--------| -| Runtime | containerd + runc | Docker daemon + runc | -| Management CLI | nerdctl | docker | -| Daemon required | Lightweight daemon | Heavy Docker daemon | -| Container support | Linux containers (LXC) | Linux containers + KVM VMs | -| Installation | nerdctl-full bundle | Docker official script | - -It is recommended to add some SWAP virtual memory before provisioning NAT servers to avoid host crash due to sudden memory spikes. - -```shell -curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh -``` +- **No KVM hardware support required** \ No newline at end of file diff --git a/docs/en/guide/podman/podman_precheck.md b/docs/en/guide/podman/podman_precheck.md index c08fee5b45..5501c2a535 100644 --- a/docs/en/guide/podman/podman_precheck.md +++ b/docs/en/guide/podman/podman_precheck.md @@ -43,23 +43,4 @@ Bulk or individual NAT server provisioning based on Podman (daemonless architect - Kernel must support overlay filesystem - Network must be able to connect to GitHub raw interface - At least 3GB free disk space -- **No KVM hardware support required** - -## Comparison with containerd and Docker - -| Feature | podman (this project) | containerd | docker | -|---------|----------------------|-----------|--------| -| Daemon | None (daemonless) | Lightweight containerd | Heavy Docker daemon | -| Runtime | crun/runc | runc | runc | -| CLI | podman | nerdctl | docker | -| Rootless support | Native | Requires config | Requires config | -| Image format | OCI | OCI | OCI | -| Network backend | netavark/CNI | CNI | Docker bridge | -| Container support | Linux containers (LXC) | Linux containers (LXC) | Linux containers + KVM VMs | -| Installation | System package manager | nerdctl-full bundle | Docker official script | - -It is recommended to add some SWAP virtual memory before provisioning NAT servers to avoid host crash due to sudden memory spikes. - -```shell -curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh -``` +- **No KVM hardware support required** \ No newline at end of file diff --git a/docs/guide/containerd/containerd_precheck.md b/docs/guide/containerd/containerd_precheck.md index f59b473ff6..017e6c3a28 100644 --- a/docs/guide/containerd/containerd_precheck.md +++ b/docs/guide/containerd/containerd_precheck.md @@ -43,28 +43,4 @@ containerd 方案**不支持 KVM/QEMU 虚拟机**，仅支持 Linux 容器（LXC - 内核需支持 overlay 文件系统 - 网络能连接 Github 的 raw 界面即可 - 空闲硬盘有 3G 以上即可 -- **不需要 KVM 硬件支持** - -## 与 docker 对比 - -| 特性 | containerd | docker | -|------|-----------|--------| -| 运行时 | containerd + runc | Docker daemon + runc | -| 管理命令 | nerdctl | docker | -| 是否需要守护进程 | 轻量级守护进程 | 重量级 Docker daemon | -| 容器支持 | Linux 容器（LXC）| Linux 容器 + KVM 虚拟机 | -| 安装方式 | nerdctl-full bundle | Docker 官方脚本 | - -推荐在开设 NAT 服务器前先增加部分 SWAP 虚拟内存，避免突发的内存占用导致宿主机卡死 - -国际 - -```shell -curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh -``` - -国内 - -```shell -curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh -``` +- **不需要 KVM 硬件支持** \ No newline at end of file diff --git a/docs/guide/podman/podman_precheck.md b/docs/guide/podman/podman_precheck.md index 997ae0d7a5..68dff2c3d3 100644 --- a/docs/guide/podman/podman_precheck.md +++ b/docs/guide/podman/podman_precheck.md @@ -43,31 +43,4 @@ Podman 方案**不支持 KVM/QEMU 虚拟机**，仅支持 Linux 容器（LXC） - 内核需支持 overlay 文件系统 - 网络能连接 Github 的 raw 界面即可 - 空闲硬盘有 3G 以上即可 -- **不需要 KVM 硬件支持** - -## 与 containerd 和 docker 对比 - -| 特性 | podman（本项目） | containerd | docker | -|------|----------------|-----------|--------| -| 守护进程 | 无（daemonless）| 轻量级 containerd | 重量级 Docker daemon | -| 运行时 | crun/runc | runc | runc | -| 管理命令 | podman | nerdctl | docker | -| rootless 支持 | 原生支持 | 需配置 | 需配置 | -| 镜像格式 | OCI | OCI | OCI | -| 网络后端 | netavark/CNI | CNI | Docker bridge | -| 容器支持 | Linux 容器（LXC） | Linux 容器（LXC） | Linux 容器 + KVM 虚拟机 | -| 安装方式 | 系统包管理器 | nerdctl-full bundle | Docker 官方脚本 | - -推荐在开设 NAT 服务器前先增加部分 SWAP 虚拟内存，避免突发的内存占用导致宿主机卡死 - -国际 - -```shell -curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh -``` - -国内 - -```shell -curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh -``` +- **不需要 KVM 硬件支持** \ No newline at end of file