Skip to content

Commit 9374d7f

Browse files
committed
docs: Remove slirp for podman6
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent aab6673 commit 9374d7f

File tree

3 files changed

+6
-36
lines changed

3 files changed

+6
-36
lines changed

docs/buildah-build.1.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -636,15 +636,6 @@ Valid _mode_ values are:
636636
- **ns:**_path_: path to a network namespace to join;
637637
- **private**: create a new namespace for the container (default)
638638
- **\<network name|ID\>**: Join the network with the given name or ID, e.g. use `--network mynet` to join the network with the name mynet. Only supported for rootful users.
639-
- **slirp4netns[:OPTIONS,...]**: use **slirp4netns**(1) to create a user network stack. This is the default for rootless containers. It is possible to specify these additional options, they can also be set with `network_cmd_options` in containers.conf:
640-
- **allow_host_loopback=true|false**: Allow slirp4netns to reach the host loopback IP (default is 10.0.2.2 or the second IP from slirp4netns cidr subnet when changed, see the cidr option below). The default is false.
641-
- **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`).
642-
- **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
643-
- **enable_ipv6=true|false**: Enable IPv6. Default is true. (Required for `outbound_addr6`).
644-
- **outbound_addr=INTERFACE**: Specify the outbound interface slirp binds to (ipv4 traffic only).
645-
- **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp binds to.
646-
- **outbound_addr6=INTERFACE**: Specify the outbound interface slirp binds to (ipv6 traffic only).
647-
- **outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp binds to.
648639
- **pasta[:OPTIONS,...]**: use **pasta**(1) to create a user-mode networking
649640
stack. \
650641
This is only supported in rootless mode. \
@@ -670,13 +661,12 @@ Valid _mode_ values are:
670661
- **pasta:--mtu,1500**: Specify a 1500 bytes MTU for the _tap_ interface in
671662
the container.
672663
- **pasta:--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-forward,10.0.2.3,-m,1500,--no-ndp,--no-dhcpv6,--no-dhcp**,
673-
equivalent to default slirp4netns(1) options: disable IPv6, assign
664+
disable IPv6, assign
674665
`10.0.2.0/24` to the `tap0` interface in the container, with gateway
675666
`10.0.2.3`, enable DNS forwarder reachable at `10.0.2.3`, set MTU to 1500
676667
bytes, disable NDP, DHCPv6 and DHCP support.
677668
- **pasta:-I,tap0,--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-forward,10.0.2.3,--no-ndp,--no-dhcpv6,--no-dhcp**,
678-
equivalent to default slirp4netns(1) options with Podman overrides: same as
679-
above, but leave the MTU to 65520 bytes
669+
same as above, but leave the MTU to 65520 bytes
680670
- **pasta:-t,auto,-u,auto,-T,auto,-U,auto**: enable automatic port forwarding
681671
based on observed bound ports from both host and container sides
682672
- **pasta:-T,5201**: enable forwarding of TCP port 5201 from container to

docs/buildah-from.1.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,6 @@ Valid _mode_ values are:
307307
- **ns:**_path_: path to a network namespace to join;
308308
- **private**: create a new namespace for the container (default)
309309
- **\<network name|ID\>**: Join the network with the given name or ID, e.g. use `--network mynet` to join the network with the name mynet. Only supported for rootful users.
310-
- **slirp4netns[:OPTIONS,...]**: use **slirp4netns**(1) to create a user network stack. This is the default for rootless containers. It is possible to specify these additional options, they can also be set with `network_cmd_options` in containers.conf:
311-
- **allow_host_loopback=true|false**: Allow slirp4netns to reach the host loopback IP (default is 10.0.2.2 or the second IP from slirp4netns cidr subnet when changed, see the cidr option below). The default is false.
312-
- **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`).
313-
- **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
314-
- **enable_ipv6=true|false**: Enable IPv6. Default is true. (Required for `outbound_addr6`).
315-
- **outbound_addr=INTERFACE**: Specify the outbound interface slirp binds to (ipv4 traffic only).
316-
- **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp binds to.
317-
- **outbound_addr6=INTERFACE**: Specify the outbound interface slirp binds to (ipv6 traffic only).
318-
- **outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp binds to.
319310
- **pasta[:OPTIONS,...]**: use **pasta**(1) to create a user-mode networking
320311
stack. \
321312
This is only supported in rootless mode. \
@@ -341,13 +332,12 @@ Valid _mode_ values are:
341332
- **pasta:--mtu,1500**: Specify a 1500 bytes MTU for the _tap_ interface in
342333
the container.
343334
- **pasta:--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-forward,10.0.2.3,-m,1500,--no-ndp,--no-dhcpv6,--no-dhcp**,
344-
equivalent to default slirp4netns(1) options: disable IPv6, assign
335+
disable IPv6, assign
345336
`10.0.2.0/24` to the `tap0` interface in the container, with gateway
346337
`10.0.2.3`, enable DNS forwarder reachable at `10.0.2.3`, set MTU to 1500
347338
bytes, disable NDP, DHCPv6 and DHCP support.
348339
- **pasta:-I,tap0,--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-forward,10.0.2.3,--no-ndp,--no-dhcpv6,--no-dhcp**,
349-
equivalent to default slirp4netns(1) options with Podman overrides: same as
350-
above, but leave the MTU to 65520 bytes
340+
same as above, but leave the MTU to 65520 bytes
351341
- **pasta:-t,auto,-u,auto,-T,auto,-U,auto**: enable automatic port forwarding
352342
based on observed bound ports from both host and container sides
353343
- **pasta:-T,5201**: enable forwarding of TCP port 5201 from container to

docs/buildah-run.1.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,6 @@ Valid _mode_ values are:
195195
- **ns:**_path_: path to a network namespace to join;
196196
- **private**: create a new namespace for the container (default)
197197
- **\<network name|ID\>**: Join the network with the given name or ID, e.g. use `--network mynet` to join the network with the name mynet. Only supported for rootful users.
198-
- **slirp4netns[:OPTIONS,...]**: use **slirp4netns**(1) to create a user network stack. This is the default for rootless containers. It is possible to specify these additional options, they can also be set with `network_cmd_options` in containers.conf:
199-
- **allow_host_loopback=true|false**: Allow slirp4netns to reach the host loopback IP (default is 10.0.2.2 or the second IP from slirp4netns cidr subnet when changed, see the cidr option below). The default is false.
200-
- **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`).
201-
- **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
202-
- **enable_ipv6=true|false**: Enable IPv6. Default is true. (Required for `outbound_addr6`).
203-
- **outbound_addr=INTERFACE**: Specify the outbound interface slirp binds to (ipv4 traffic only).
204-
- **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp binds to.
205-
- **outbound_addr6=INTERFACE**: Specify the outbound interface slirp binds to (ipv6 traffic only).
206-
- **outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp binds to.
207198
- **pasta[:OPTIONS,...]**: use **pasta**(1) to create a user-mode networking
208199
stack. \
209200
This is only supported in rootless mode. \
@@ -229,13 +220,12 @@ Valid _mode_ values are:
229220
- **pasta:--mtu,1500**: Specify a 1500 bytes MTU for the _tap_ interface in
230221
the container.
231222
- **pasta:--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-forward,10.0.2.3,-m,1500,--no-ndp,--no-dhcpv6,--no-dhcp**,
232-
equivalent to default slirp4netns(1) options: disable IPv6, assign
223+
disable IPv6, assign
233224
`10.0.2.0/24` to the `tap0` interface in the container, with gateway
234225
`10.0.2.3`, enable DNS forwarder reachable at `10.0.2.3`, set MTU to 1500
235226
bytes, disable NDP, DHCPv6 and DHCP support.
236227
- **pasta:-I,tap0,--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-forward,10.0.2.3,--no-ndp,--no-dhcpv6,--no-dhcp**,
237-
equivalent to default slirp4netns(1) options with Podman overrides: same as
238-
above, but leave the MTU to 65520 bytes
228+
same as above, but leave the MTU to 65520 bytes
239229
- **pasta:-t,auto,-u,auto,-T,auto,-U,auto**: enable automatic port forwarding
240230
based on observed bound ports from both host and container sides
241231
- **pasta:-T,5201**: enable forwarding of TCP port 5201 from container to

0 commit comments

Comments
 (0)