Merge pull request #517 from jnoordsij/alpine3.21

Update to Alpine 3.21
docker-library · Dec 6, 2024 · b37a8b9 · b37a8b9
2 parents 98c68d8 + cf45da5
commit b37a8b9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile
diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile
diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile
diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile
diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template
@@ -1,5 +1,5 @@
 {{ include "shared" -}}
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache \
 		ca-certificates \

diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template
@@ -25,7 +25,7 @@ RUN set -eux; \
 	apk add --no-cache iptables-legacy; \
 # set up a symlink farm we can use PATH to switch to legacy with
 	mkdir -p /usr/local/sbin/.iptables-legacy; \
-# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73
+# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77
 	for f in \
 		iptables \
 		iptables-save \
@@ -35,8 +35,8 @@ RUN set -eux; \
 		ip6tables-restore \
 	; do \
 # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc.
-# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64
-		b="/sbin/${f/tables/tables-legacy}"; \
+# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64
+		b="$(command -v "${f/tables/tables-legacy}")"; \
 		"$b" --version; \
 		ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \
 	done; \