From 4c2674df4f40c965cdb8ccc77b8ce9dbc247a6c9 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 14 Dec 2023 10:13:53 +0100 Subject: [PATCH] Remove ip_tables in favor of nf_tables in dockerd entrypoint fallback --- 24/dind/dockerd-entrypoint.sh | 2 +- 25-rc/dind/dockerd-entrypoint.sh | 2 +- dockerd-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 60a4f5627a..056ee2ae0a 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -147,7 +147,7 @@ if [ "$1" = 'dockerd' ]; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 modprobe nf_tables || : fi diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 60a4f5627a..056ee2ae0a 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -147,7 +147,7 @@ if [ "$1" = 'dockerd' ]; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 modprobe nf_tables || : fi diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 60a4f5627a..056ee2ae0a 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -147,7 +147,7 @@ if [ "$1" = 'dockerd' ]; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 modprobe nf_tables || : fi