Skip to content

Commit 73e39f7

Browse files
committed
fix: 删除无效内容
1 parent f58b071 commit 73e39f7

4 files changed

Lines changed: 4 additions & 90 deletions

File tree

docs/en/guide/containerd/containerd_precheck.md

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,4 @@ Bulk or individual NAT server provisioning based on containerd + nerdctl runtime
4343
- Kernel must support overlay filesystem
4444
- Network must be able to connect to GitHub raw interface
4545
- At least 3GB free disk space
46-
- **No KVM hardware support required**
47-
48-
## Comparison with Docker
49-
50-
| Feature | containerd | docker |
51-
|---------|-----------|--------|
52-
| Runtime | containerd + runc | Docker daemon + runc |
53-
| Management CLI | nerdctl | docker |
54-
| Daemon required | Lightweight daemon | Heavy Docker daemon |
55-
| Container support | Linux containers (LXC) | Linux containers + KVM VMs |
56-
| Installation | nerdctl-full bundle | Docker official script |
57-
58-
It is recommended to add some SWAP virtual memory before provisioning NAT servers to avoid host crash due to sudden memory spikes.
59-
60-
```shell
61-
curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh
62-
```
46+
- **No KVM hardware support required**

docs/en/guide/podman/podman_precheck.md

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,4 @@ Bulk or individual NAT server provisioning based on Podman (daemonless architect
4343
- Kernel must support overlay filesystem
4444
- Network must be able to connect to GitHub raw interface
4545
- At least 3GB free disk space
46-
- **No KVM hardware support required**
47-
48-
## Comparison with containerd and Docker
49-
50-
| Feature | podman (this project) | containerd | docker |
51-
|---------|----------------------|-----------|--------|
52-
| Daemon | None (daemonless) | Lightweight containerd | Heavy Docker daemon |
53-
| Runtime | crun/runc | runc | runc |
54-
| CLI | podman | nerdctl | docker |
55-
| Rootless support | Native | Requires config | Requires config |
56-
| Image format | OCI | OCI | OCI |
57-
| Network backend | netavark/CNI | CNI | Docker bridge |
58-
| Container support | Linux containers (LXC) | Linux containers (LXC) | Linux containers + KVM VMs |
59-
| Installation | System package manager | nerdctl-full bundle | Docker official script |
60-
61-
It is recommended to add some SWAP virtual memory before provisioning NAT servers to avoid host crash due to sudden memory spikes.
62-
63-
```shell
64-
curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh
65-
```
46+
- **No KVM hardware support required**

docs/guide/containerd/containerd_precheck.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,4 @@ containerd 方案**不支持 KVM/QEMU 虚拟机**,仅支持 Linux 容器(LXC
4343
- 内核需支持 overlay 文件系统
4444
- 网络能连接 Github 的 raw 界面即可
4545
- 空闲硬盘有 3G 以上即可
46-
- **不需要 KVM 硬件支持**
47-
48-
## 与 docker 对比
49-
50-
| 特性 | containerd | docker |
51-
|------|-----------|--------|
52-
| 运行时 | containerd + runc | Docker daemon + runc |
53-
| 管理命令 | nerdctl | docker |
54-
| 是否需要守护进程 | 轻量级守护进程 | 重量级 Docker daemon |
55-
| 容器支持 | Linux 容器(LXC)| Linux 容器 + KVM 虚拟机 |
56-
| 安装方式 | nerdctl-full bundle | Docker 官方脚本 |
57-
58-
推荐在开设 NAT 服务器前先增加部分 SWAP 虚拟内存,避免突发的内存占用导致宿主机卡死
59-
60-
国际
61-
62-
```shell
63-
curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh
64-
```
65-
66-
国内
67-
68-
```shell
69-
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
70-
```
46+
- **不需要 KVM 硬件支持**

docs/guide/podman/podman_precheck.md

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,4 @@ Podman 方案**不支持 KVM/QEMU 虚拟机**,仅支持 Linux 容器(LXC)
4343
- 内核需支持 overlay 文件系统
4444
- 网络能连接 Github 的 raw 界面即可
4545
- 空闲硬盘有 3G 以上即可
46-
- **不需要 KVM 硬件支持**
47-
48-
## 与 containerd 和 docker 对比
49-
50-
| 特性 | podman(本项目) | containerd | docker |
51-
|------|----------------|-----------|--------|
52-
| 守护进程 | 无(daemonless)| 轻量级 containerd | 重量级 Docker daemon |
53-
| 运行时 | crun/runc | runc | runc |
54-
| 管理命令 | podman | nerdctl | docker |
55-
| rootless 支持 | 原生支持 | 需配置 | 需配置 |
56-
| 镜像格式 | OCI | OCI | OCI |
57-
| 网络后端 | netavark/CNI | CNI | Docker bridge |
58-
| 容器支持 | Linux 容器(LXC) | Linux 容器(LXC) | Linux 容器 + KVM 虚拟机 |
59-
| 安装方式 | 系统包管理器 | nerdctl-full bundle | Docker 官方脚本 |
60-
61-
推荐在开设 NAT 服务器前先增加部分 SWAP 虚拟内存,避免突发的内存占用导致宿主机卡死
62-
63-
国际
64-
65-
```shell
66-
curl -L https://raw.githubusercontent.com/spiritLHLS/addswap/main/addswap.sh -o addswap.sh && chmod +x addswap.sh && bash addswap.sh
67-
```
68-
69-
国内
70-
71-
```shell
72-
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
73-
```
46+
- **不需要 KVM 硬件支持**

0 commit comments

Comments
 (0)