Skip to content

Commit 04e588e

Browse files
committed
docs/tutorials: Remove slirp
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent ed3df32 commit 04e588e

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

docs/tutorials/performance.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ You can avoid using _pasta_ in the following ways:
171171
* Use `--network=host`. No network namespace is created. The container will use the host’s network.
172172
Note: By using `--network=host`, the container is given full access to local system services such as D-bus and is therefore considered insecure.
173173

174-
Side note: Pasta is faster than the network driver [slirp4netns](https://github.com/containers/podman/blob/main/docs/tutorials/basic_networking.md#slirp4netns).
175-
Pasta is the default network driver since Podman 5.0.0.
174+
Side note: Pasta is the default network driver since Podman 5.0.0. Slirp4netns support has been removed since 6.0.0.
176175

177176
Since Podman 5.1.0 the default network driver can be shown with
178177

docs/tutorials/rootless_tutorial.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,18 @@ For building Podman, see the [build instructions](https://podman.io/getting-star
1818

1919
A user-mode networking tool for unprivileged network namespaces must be installed on the machine in order for Podman to run in a rootless environment.
2020

21-
Podman supports two rootless networking tools: [pasta](https://passt.top/passt/about/#pasta) (provided by [passt](https://passt.top/passt/about/)) and [slirp4netns](https://github.com/rootless-containers/slirp4netns).
21+
Podman supports two rootless networking tools: [pasta](https://passt.top/passt/about/#pasta) (provided by [passt](https://passt.top/passt/about/)).
2222

2323
pasta is the default since Podman 5.0, while slirp4netns was the default for previous versions. Passt is a more modern replacement for SLIRP that amongst other things fully supports IPv6 and is more secure architecturally (runs in a separate process, uses modern Linux mechanisms for isolation etc).
2424

2525
Passt is [available on most Linux distributions](https://passt.top/passt/about/#availability) via their package distribution software such as `yum`, `dnf`, `apt`, `zypper`, etc. under the name `passt`. If the package is not available, you can build and install `passt` from [its upstream](https://passt.top/passt/about/#try-it).
2626

27-
Alternatively, slirp4netns can be installed in the same fashion either from your distribution's repositories or by following [the instructions](https://github.com/rootless-containers/slirp4netns?tab=readme-ov-file#install) provided on its GitHub.
28-
2927
The major user-facing difference between the two is outlined in [this blog post](https://blog.podman.io/2024/03/podman-5-0-breaking-changes-in-detail/) and expanded upon in **[podman-network(1)](https://github.com/containers/podman/blob/main/docs/source/markdown/podman-network.1.md#pasta)**.
3028

3129
> [!note]
3230
> pasta's default situation of not being being able to communicate between the container and the host has been fixed in Podman 5.3: see [Podman 5.3 changes for improved networking experience with pasta](https://blog.podman.io/2024/10/podman-5-3-changes-for-improved-networking-experience-with-pasta/).
3331
34-
The default rootless networking tool can be selected in **[containers.conf(5)](https://github.com/containers/common/blob/main/docs/containers.conf.5.md)** under the `[network]` section with `default_rootless_network_cmd`, which can be set to `pasta` (default) or `slirp4netns`.
32+
The default rootless networking tool can be selected in **[containers.conf(5)](https://github.com/containers/common/blob/main/docs/containers.conf.5.md)** under the `[network]` section with `default_rootless_network_cmd`, which can be set to `pasta` (default).
3533

3634
### `/etc/subuid` and `/etc/subgid` configuration
3735

0 commit comments

Comments
 (0)