diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 3f2960ac4..f385b9608 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache \ ca-certificates \ diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 00819384b..056ee2ae0 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -147,7 +147,8 @@ 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 uid="$(id -u)" diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 759ac327a..b1ac0aa74 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache \ ca-certificates \ diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 00819384b..056ee2ae0 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -147,7 +147,8 @@ 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 uid="$(id -u)" diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 1ae00e841..05c75697b 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache \ ca-certificates \ diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 00819384b..056ee2ae0 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -147,7 +147,8 @@ 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 uid="$(id -u)"