From 32adc77e748436434a4b83cc899d1a01babbbebf Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 6 Feb 2026 14:00:30 +0100
Subject: [PATCH] prepare release: deprecate Ubuntu 24.10 and add Ubuntu 25.10

---
 .github/ISSUE_TEMPLATE/checklist-for-release.md    | 2 +-
 docker/ubuntu-24.10/docker_conf.inc                | 1 -
 docker/{ubuntu-24.10 => ubuntu-25.10}/Dockerfile   | 2 +-
 docker/{ubuntu-24.10 => ubuntu-25.10}/README.md    | 2 +-
 docker/ubuntu-25.10/docker_conf.inc                | 1 +
 docker/{ubuntu-24.10 => ubuntu-25.10}/run_tests.sh | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 docker/ubuntu-24.10/docker_conf.inc
 rename docker/{ubuntu-24.10 => ubuntu-25.10}/Dockerfile (98%)
 rename docker/{ubuntu-24.10 => ubuntu-25.10}/README.md (92%)
 create mode 100644 docker/ubuntu-25.10/docker_conf.inc
 rename docker/{ubuntu-24.10 => ubuntu-25.10}/run_tests.sh (82%)

diff --git a/.github/ISSUE_TEMPLATE/checklist-for-release.md b/.github/ISSUE_TEMPLATE/checklist-for-release.md
index c87682698..8e3a01ca0 100644
--- a/.github/ISSUE_TEMPLATE/checklist-for-release.md
+++ b/.github/ISSUE_TEMPLATE/checklist-for-release.md
@@ -37,8 +37,8 @@ Run `tools/release_tests.sh` on:
   - [ ] OpenSuse Tumbleweed
   - [ ] ParrotOS
   - [ ] Ubuntu 24.04 (LTS)
-  - [ ] Ubuntu 24.10
   - [ ] Ubuntu 25.04
+  - [ ] Ubuntu 25.10
 - [ ] OSX (MacPorts)
 - [ ] OSX (Homebrew)
 - [ ] Termux
diff --git a/docker/ubuntu-24.10/docker_conf.inc b/docker/ubuntu-24.10/docker_conf.inc
deleted file mode 100644
index a6c548152..000000000
--- a/docker/ubuntu-24.10/docker_conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-ubuntu-24.10:1.0
diff --git a/docker/ubuntu-24.10/Dockerfile b/docker/ubuntu-25.10/Dockerfile
similarity index 98%
rename from docker/ubuntu-24.10/Dockerfile
rename to docker/ubuntu-25.10/Dockerfile
index 87c0a873e..10b9903eb 100644
--- a/docker/ubuntu-24.10/Dockerfile
+++ b/docker/ubuntu-25.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.10
+FROM ubuntu:25.10
 
 ENV LANG=C
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/docker/ubuntu-24.10/README.md b/docker/ubuntu-25.10/README.md
similarity index 92%
rename from docker/ubuntu-24.10/README.md
rename to docker/ubuntu-25.10/README.md
index 53a3a2107..6d8cfd1ac 100644
--- a/docker/ubuntu-24.10/README.md
+++ b/docker/ubuntu-25.10/README.md
@@ -9,7 +9,7 @@ If all tests OK,  the script will finish with PASS.
 The script is to be run in proxmark root folder inside the docker env.
 
 ```
-docker/ubuntu-24.10/run_tests.sh;
+docker/ubuntu-25.10/run_tests.sh;
 ``` 
 
 Or if you want to run single test,  
diff --git a/docker/ubuntu-25.10/docker_conf.inc b/docker/ubuntu-25.10/docker_conf.inc
new file mode 100644
index 000000000..3c512afaa
--- /dev/null
+++ b/docker/ubuntu-25.10/docker_conf.inc
@@ -0,0 +1 @@
+DOCKER_IMAGE=pm3-ubuntu-25.10:1.0
diff --git a/docker/ubuntu-24.10/run_tests.sh b/docker/ubuntu-25.10/run_tests.sh
similarity index 82%
rename from docker/ubuntu-24.10/run_tests.sh
rename to docker/ubuntu-25.10/run_tests.sh
index c318be0f7..6bd042484 100755
--- a/docker/ubuntu-24.10/run_tests.sh
+++ b/docker/ubuntu-25.10/run_tests.sh
@@ -2,7 +2,7 @@
 # Iceman 2022
 #
 # This script is to be run from proxmark root folder inside the docker env
-# docker/ubuntu-24.10/run_tests.sh;
+# docker/ubuntu-25.10/run_tests.sh;
 
 sudo apt update && sudo apt upgrade -y
 tools/release_tests.sh