From 5eefbd30c5c35f73cb944ce78b15e924a2768c2e Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 5 Dec 2024 14:13:25 +0100 Subject: [PATCH 1/2] Update to Alpine 3.21 --- 27-rc/cli/Dockerfile | 2 +- 27/cli/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 081d211cf..da1e97cb1 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.21 RUN apk add --no-cache \ ca-certificates \ diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 0bcc9c49f..9b3e9f870 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.21 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 5b9eb2ac0..c47397831 100644 --- 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 \ From cf45da5b64c473e818a42e818dfb3151c398c613 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Thu, 5 Dec 2024 16:09:24 -0800 Subject: [PATCH 2/2] Adjust iptables-legacy binaries to new path in `/usr/sbin` https://gitlab.alpinelinux.org/alpine/aports/-/commit/c49f2fa7aeab3487da65ca4398477af73fde51cb --- 27-rc/dind/Dockerfile | 6 +++--- 27/dind/Dockerfile | 6 +++--- Dockerfile-dind.template | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index df275018b..657a406a5 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -30,7 +30,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 \ @@ -40,8 +40,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; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 991bbb7c1..273773df1 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -30,7 +30,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 \ @@ -40,8 +40,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; \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index a70743631..e9dafb72c 100644 --- 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; \