Skip to content

Commit 2af19b6

Browse files
committed
Don't try to modprobe ip6_tables in the moby dev container
dockerd will now do this itself, if ip6tables is enabled. Signed-off-by: Rob Murray <[email protected]>
1 parent f2e1f52 commit 2af19b6

1 file changed

Lines changed: 0 additions & 13 deletions

File tree

hack/make/run

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,6 @@ if [ -n "$DOCKER_ROOTLESS" ]; then
9191
)
9292
fi
9393

94-
# On a host using nftables, the ip6_tables kernel module may need to be loaded.
95-
# This trick is borrowed from the docker (dind) official image ...
96-
# "modprobe" without modprobe
97-
# https://twitter.com/lucabruno/status/902934379835662336
98-
# This isn't 100% fool-proof, but it'll have a much higher success rate than
99-
# simply using the "real" modprobe (which isn't installed in the dev container).
100-
if ! ip6tables -nL > /dev/null 2>&1; then
101-
ip link show ip6_tables > /dev/null 2>&1 || true
102-
if ! ip6tables -nL > /dev/null 2>&1; then
103-
echo >&2 'ip6tables is not available'
104-
fi
105-
fi
106-
10794
set -x
10895
# shellcheck disable=SC2086
10996
exec "${dockerd[@]}" "${args[@]}"

0 commit comments

Comments
 (0)