From eaf65f505334595d2eeb21877daf6e43f46d8b3b Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 22 May 2025 10:46:01 +1000
Subject: [PATCH] Make 10.6 for jammy

---
 {10.6-jammy => 10.6}/Dockerfile           |  2 +-
 {10.6-jammy => 10.6}/docker-entrypoint.sh |  0
 {10.6-jammy => 10.6}/healthcheck.sh       |  0
 update.sh                                 |  3 +--
 versions.json                             | 32 ++---------------------
 5 files changed, 4 insertions(+), 33 deletions(-)
 rename {10.6-jammy => 10.6}/Dockerfile (99%)
 rename {10.6-jammy => 10.6}/docker-entrypoint.sh (100%)
 rename {10.6-jammy => 10.6}/healthcheck.sh (100%)

diff --git a/10.6-jammy/Dockerfile b/10.6/Dockerfile
similarity index 99%
rename from 10.6-jammy/Dockerfile
rename to 10.6/Dockerfile
index 681768a..bafd815 100644
--- a/10.6-jammy/Dockerfile
+++ b/10.6/Dockerfile
@@ -79,7 +79,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_MAJOR=10.6-jammy
+ARG MARIADB_MAJOR=10.6
 ENV MARIADB_MAJOR $MARIADB_MAJOR
 ARG MARIADB_VERSION=1:10.6.22+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
diff --git a/10.6-jammy/docker-entrypoint.sh b/10.6/docker-entrypoint.sh
similarity index 100%
rename from 10.6-jammy/docker-entrypoint.sh
rename to 10.6/docker-entrypoint.sh
diff --git a/10.6-jammy/healthcheck.sh b/10.6/healthcheck.sh
similarity index 100%
rename from 10.6-jammy/healthcheck.sh
rename to 10.6/healthcheck.sh
diff --git a/update.sh b/update.sh
index 4145b56..c20f400 100755
--- a/update.sh
+++ b/update.sh
@@ -10,8 +10,7 @@ development_version_real=12.1
 defaultSuite='noble'
 declare -A suites=(
 	[10.5]='focal'
-	[10.6]='focal'
-	['10.6-jammy']='jammy'
+	[10.6]='jammy'
 	[10.11]='jammy'
 )
 
diff --git a/versions.json b/versions.json
index 65fb37a..4a6eebf 100644
--- a/versions.json
+++ b/versions.json
@@ -114,10 +114,10 @@
   "10.6": {
     "milestone": "10.6",
     "version": "10.6.22",
-    "fullVersion": "1:10.6.22+maria~ubu2004",
+    "fullVersion": "1:10.6.22+maria~ubu2204",
     "releaseStatus": "Stable",
     "supportType": "Long Term Support",
-    "base": "ubuntu:focal",
+    "base": "ubuntu:jammy",
     "arches": [
       "amd64",
       "arm64v8",
@@ -138,33 +138,5 @@
       "ppc64le",
       "s390x"
     ]
-  },
-  "10.5": {
-    "milestone": "10.5",
-    "version": "10.5.29",
-    "fullVersion": "1:10.5.29+maria~ubu2004",
-    "releaseStatus": "Stable",
-    "supportType": "Long Term Support",
-    "base": "ubuntu:focal",
-    "arches": [
-      "amd64",
-      "arm64v8",
-      "ppc64le",
-      "s390x"
-    ]
-  },
-  "10.6-jammy": {
-    "milestone": "10.6",
-    "version": "10.6.22",
-    "fullVersion": "1:10.6.22+maria~ubu2204",
-    "releaseStatus": "Stable",
-    "supportType": "Long Term Support",
-    "base": "ubuntu:jammy",
-    "arches": [
-      "amd64",
-      "arm64v8",
-      "ppc64le",
-      "s390x"
-    ]
   }
 }