From b371d344831cc50c3fc98a50320b73166f8ebf0f Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <=>
Date: Thu, 1 Oct 2026 09:20:04 +0200
Subject: [PATCH] feat: version bump to Satosa 8.6 and Alpine 3.24

Cf: https://github.com/IdentityPython/SATOSA/commit/f6c8994554689f824ab6d47a8f4c2b4cabf2dd32
Cf: https://www.alpinelinux.org/posts/Alpine-3.24.0-released.html
---
 {8.5/alpine3.23 => 8.6/alpine3.24}/Dockerfile           | 4 ++--
 {8.5/alpine3.23 => 8.6/alpine3.24}/docker-entrypoint.sh | 0
 {8.5 => 8.6}/trixie/Dockerfile                          | 2 +-
 {8.5 => 8.6}/trixie/docker-entrypoint.sh                | 0
 generate-stackbrew-library.sh                           | 2 +-
 versions.json                                           | 6 +++---
 versions.sh                                             | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename {8.5/alpine3.23 => 8.6/alpine3.24}/Dockerfile (97%)
 rename {8.5/alpine3.23 => 8.6/alpine3.24}/docker-entrypoint.sh (100%)
 rename {8.5 => 8.6}/trixie/Dockerfile (98%)
 rename {8.5 => 8.6}/trixie/docker-entrypoint.sh (100%)

diff --git a/8.5/alpine3.23/Dockerfile b/8.6/alpine3.24/Dockerfile
similarity index 97%
rename from 8.5/alpine3.23/Dockerfile
rename to 8.6/alpine3.24/Dockerfile
index 70f0e45..fe27f0c 100644
--- a/8.5/alpine3.23/Dockerfile
+++ b/8.6/alpine3.24/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM python:3.14-alpine3.23
+FROM python:3.14-alpine3.24
 
 # runtime dependencies
 RUN set -eux; \
@@ -21,7 +21,7 @@ RUN set -eux; \
 		yq \
 	;
 
-ENV SATOSA_VERSION=8.5.1
+ENV SATOSA_VERSION=8.6.0
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps \
 		bluez-dev \
diff --git a/8.5/alpine3.23/docker-entrypoint.sh b/8.6/alpine3.24/docker-entrypoint.sh
similarity index 100%
rename from 8.5/alpine3.23/docker-entrypoint.sh
rename to 8.6/alpine3.24/docker-entrypoint.sh
diff --git a/8.5/trixie/Dockerfile b/8.6/trixie/Dockerfile
similarity index 98%
rename from 8.5/trixie/Dockerfile
rename to 8.6/trixie/Dockerfile
index 55b95b7..c858fe4 100644
--- a/8.5/trixie/Dockerfile
+++ b/8.6/trixie/Dockerfile
@@ -21,7 +21,7 @@ RUN set -eux; \
 		yq \
 	;
 
-ENV SATOSA_VERSION=8.5.1
+ENV SATOSA_VERSION=8.6.0
 RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
diff --git a/8.5/trixie/docker-entrypoint.sh b/8.6/trixie/docker-entrypoint.sh
similarity index 100%
rename from 8.5/trixie/docker-entrypoint.sh
rename to 8.6/trixie/docker-entrypoint.sh
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 4a4dfe0..a4b236e 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[8.5]='8 latest'
+	[8.6]='8 latest'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/versions.json b/versions.json
index 492d4ef..016dc4d 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
-  "8.5": {
+  "8.6": {
     "python_version": "3.14",
     "variants": [
       "trixie",
-      "alpine3.23"
+      "alpine3.24"
     ],
-    "version": "8.5.1"
+    "version": "8.6.0"
   }
 }
diff --git a/versions.sh b/versions.sh
index 79addc6..d6ee04d 100755
--- a/versions.sh
+++ b/versions.sh
@@ -22,7 +22,7 @@ eval $(
 		| jq -r '
 			. as $versions
 			| [ $versions|keys[] | select(contains("-rc") | not) ] | sort_by(split(".") | map(tonumber)) | last as $latest
-			| [ $versions | .[$latest].variants[] | select(test("alpine3.23|slim-trixie")) ] | join(" ") as $variants
+			| [ $versions | .[$latest].variants[] | select(test("alpine3.24|slim-trixie")) ] | join(" ") as $variants
 			| @sh "export python_version=\($latest) variants=\($variants)"
 		'
 )