Skip to content

Commit 4ed44e2

Browse files
committed
common/docs: remove slirp
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 86f992f commit 4ed44e2

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

common/docs/containers.conf.5.md

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,9 @@ Logging driver for the container. Currently available options are k8s-file, jour
298298

299299
**log_path**=""
300300

301-
Default path for container logs to be stored in. When empty, logs will be stored
301+
Default path for container logs to be stored in. When empty, logs will be stored
302302
in the container's default storage and removed when the container is removed.
303-
A subdirectory named with the container ID will be created under the specified
303+
A subdirectory named with the container ID will be created under the specified
304304
path, and the log file will have the default name `ctr.log` within that directory.
305305
This option can be overridden by the `--log-opt` flag.
306306

@@ -495,8 +495,8 @@ default_subnet_pools = [
495495

496496
**default_rootless_network_cmd**="pasta"
497497

498-
Configure which rootless network program to use by default. Valid options are
499-
`slirp4netns` and `pasta` (default).
498+
Configure which rootless network program to use by default. Only current valid option is
499+
`pasta` (default).
500500

501501
**network_config_dir**="/etc/cni/net.d/"
502502

@@ -675,7 +675,6 @@ The following binaries are searched in these directories:
675675
- catatonit
676676
- netavark
677677
- pasta
678-
- slirp4netns
679678

680679
Podman machine uses it for these binaries:
681680
- gvproxy
@@ -776,28 +775,6 @@ create new containers and pods in that namespace. The default namespace is "",
776775
which corresponds to no namespace. When no namespace is set, all containers
777776
and pods are visible.
778777

779-
**network_cmd_path**=""
780-
781-
Path to the slirp4netns binary.
782-
783-
**network_cmd_options**=[]
784-
785-
Default options to pass to the slirp4netns binary.
786-
787-
Valid options values are:
788-
789-
- **allow_host_loopback=true|false**: Allow the slirp4netns to reach the host loopback IP (`10.0.2.2`). Default is false.
790-
- **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`).
791-
- **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
792-
- **enable_ipv6=true|false**: Enable IPv6. Default is true. (Required for `outbound_addr6`).
793-
- **outbound_addr=INTERFACE**: Specify the outbound interface slirp should bind to (ipv4 traffic only).
794-
- **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp should bind to.
795-
- **outbound_addr6=INTERFACE**: Specify the outbound interface slirp should bind to (ipv6 traffic only).
796-
- **outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp should bind to.
797-
- **port_handler=rootlesskit**: Use rootlesskit for port forwarding. Default.
798-
Note: Rootlesskit changes the source IP address of incoming packets to a IP address in the container network namespace, usually `10.0.2.100`. If your application requires the real source IP address, e.g. web server logs, use the slirp4netns port handler. The rootlesskit port handler is also used for rootless containers when connected to user-defined networks.
799-
- **port_handler=slirp4netns**: Use the slirp4netns port forwarding, it is slower than rootlesskit but preserves the correct source IP address. This port handler cannot be used for user-defined networks.
800-
801778
**no_pivot_root**=false
802779

803780
Whether to use chroot instead of pivot_root in the runtime.

0 commit comments

Comments
 (0)