Skip to content

Commit

Permalink
Merge pull request #501 from infosiftr/ip6tables
Browse files Browse the repository at this point in the history
Also load `ip6_tables` when trying to load `ip_tables`
  • Loading branch information
yosifkit authored Jun 20, 2024
2 parents 255b5d8 + 12a00d7 commit 5753ec0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions 24/dind/dockerd-entrypoint.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions 25/dind/dockerd-entrypoint.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions 26/dind/dockerd-entrypoint.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions 27-rc/dind/dockerd-entrypoint.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions dockerd-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ if [ "$1" = 'dockerd' ]; then
iptablesLegacy="$DOCKER_IPTABLES_LEGACY"
if [ -n "$iptablesLegacy" ]; then
modprobe ip_tables || :
modprobe ip6_tables || :
else
modprobe nf_tables || :
fi
Expand All @@ -173,6 +174,7 @@ if [ "$1" = 'dockerd' ]; then
if ! iptables -nL > /dev/null 2>&1; then
# might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback)
modprobe ip_tables || :
modprobe ip6_tables || :
if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then
iptablesLegacy=1
fi
Expand Down

0 comments on commit 5753ec0

Please sign in to comment.