From f4d851e08d6da2dd25f0135df489c0197181467f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Sat, 13 Jun 2026 09:10:24 +0200
Subject: [PATCH 1/2] ansible: update Alpine to 3.23 and 3.24

They are already the versions used by the official Docker images.
---
 .../{alpine321.Dockerfile.j2 => alpine323.Dockerfile.j2}    | 6 +++---
 .../{alpine322.Dockerfile.j2 => alpine324.Dockerfile.j2}    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ansible/roles/docker/templates/{alpine321.Dockerfile.j2 => alpine323.Dockerfile.j2} (96%)
 rename ansible/roles/docker/templates/{alpine322.Dockerfile.j2 => alpine324.Dockerfile.j2} (96%)

diff --git a/ansible/roles/docker/templates/alpine321.Dockerfile.j2 b/ansible/roles/docker/templates/alpine323.Dockerfile.j2
similarity index 96%
rename from ansible/roles/docker/templates/alpine321.Dockerfile.j2
rename to ansible/roles/docker/templates/alpine323.Dockerfile.j2
index cd5942ec8..02cedb520 100644
--- a/ansible/roles/docker/templates/alpine321.Dockerfile.j2
+++ b/ansible/roles/docker/templates/alpine323.Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM alpine:3.21
+FROM alpine:3.23
 
 ENV LC_ALL C
 ENV USER {{ server_user }}
@@ -22,7 +22,7 @@ RUN apk add --no-cache --virtual .build-deps \
         binutils-gold \
         cargo \
         curl \
-        clang19 \
+        clang21 \
         g++ \
         gcc \
         gnupg \
@@ -33,7 +33,7 @@ RUN apk add --no-cache --virtual .build-deps \
         rust \
         tar \
         ccache \
-        openjdk21 \
+        openjdk25 \
         git \
         procps-ng \
         openssh-client-default \
diff --git a/ansible/roles/docker/templates/alpine322.Dockerfile.j2 b/ansible/roles/docker/templates/alpine324.Dockerfile.j2
similarity index 96%
rename from ansible/roles/docker/templates/alpine322.Dockerfile.j2
rename to ansible/roles/docker/templates/alpine324.Dockerfile.j2
index 65680593b..7b7d24b40 100644
--- a/ansible/roles/docker/templates/alpine322.Dockerfile.j2
+++ b/ansible/roles/docker/templates/alpine324.Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM alpine:3.22
+FROM alpine:3.24
 
 ENV LC_ALL C
 ENV USER {{ server_user }}
@@ -22,7 +22,7 @@ RUN apk add --no-cache --virtual .build-deps \
         binutils-gold \
         cargo \
         curl \
-        clang \
+        clang21 \
         g++ \
         gcc \
         gnupg \
@@ -33,7 +33,7 @@ RUN apk add --no-cache --virtual .build-deps \
         rust \
         tar \
         ccache \
-        openjdk21 \
+        openjdk25 \
         git \
         procps-ng \
         openssh-client-default \

From 798c50b4be1721a2c86b26383f61e2ab7a0c20e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Sat, 13 Jun 2026 13:48:52 +0200
Subject: [PATCH 2/2] use clang22 on 3.24

---
 ansible/roles/docker/templates/alpine324.Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/docker/templates/alpine324.Dockerfile.j2 b/ansible/roles/docker/templates/alpine324.Dockerfile.j2
index 7b7d24b40..6b871a845 100644
--- a/ansible/roles/docker/templates/alpine324.Dockerfile.j2
+++ b/ansible/roles/docker/templates/alpine324.Dockerfile.j2
@@ -22,7 +22,7 @@ RUN apk add --no-cache --virtual .build-deps \
         binutils-gold \
         cargo \
         curl \
-        clang21 \
+        clang22 \
         g++ \
         gcc \
         gnupg \