Merge pull request #461 from jnoordsij/update-alpine-3.19

Update to Alpine 3.19
docker-library · Dec 14, 2023 · 0411c8f · 0411c8f
2 parents d8b20e0 + 18bbfb7
commit 0411c8f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile
diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh
diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile
diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh
diff --git 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
@@ -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)"