From 8b9a47d0544826a8fb7c01b4308b400c3f6e529f Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 15 Aug 2024 14:21:06 +1000 Subject: [PATCH] fix < 11.5 version number due to prev release hack --- 10.11-ubi/docker-entrypoint.sh | 2 +- 10.11/Dockerfile | 2 +- 10.11/docker-entrypoint.sh | 2 +- 10.5/docker-entrypoint.sh | 2 +- 10.6-ubi/docker-entrypoint.sh | 2 +- 10.6/docker-entrypoint.sh | 2 +- 11.1/docker-entrypoint.sh | 2 +- 11.2/docker-entrypoint.sh | 2 +- 11.4-ubi/docker-entrypoint.sh | 2 +- 11.4/docker-entrypoint.sh | 2 +- versions.json | 46 ++++++++++++++++++++++------------ 11 files changed, 40 insertions(+), 26 deletions(-) diff --git a/10.11-ubi/docker-entrypoint.sh b/10.11-ubi/docker-entrypoint.sh index 3e1aa001..a18aef0b 100755 --- a/10.11-ubi/docker-entrypoint.sh +++ b/10.11-ubi/docker-entrypoint.sh @@ -222,7 +222,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.11.8-MariaDB" + echo -n "10.11.9-MariaDB" } # initializes the database directory diff --git a/10.11/Dockerfile b/10.11/Dockerfile index 74fe2a70..ded310b5 100644 --- a/10.11/Dockerfile +++ b/10.11/Dockerfile @@ -75,7 +75,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="10.11.8" \ + org.opencontainers.image.version="10.11.9" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index 3e1aa001..a18aef0b 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -222,7 +222,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.11.8-MariaDB" + echo -n "10.11.9-MariaDB" } # initializes the database directory diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index 23e54062..23180d6f 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -214,7 +214,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.5.25-MariaDB" + echo -n "10.5.26-MariaDB" } # initializes the database directory diff --git a/10.6-ubi/docker-entrypoint.sh b/10.6-ubi/docker-entrypoint.sh index e049b08b..306b2137 100755 --- a/10.6-ubi/docker-entrypoint.sh +++ b/10.6-ubi/docker-entrypoint.sh @@ -214,7 +214,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.6.18-MariaDB" + echo -n "10.6.19-MariaDB" } # initializes the database directory diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index e049b08b..306b2137 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -214,7 +214,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.6.18-MariaDB" + echo -n "10.6.19-MariaDB" } # initializes the database directory diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh index 5f814b6f..beb65108 100755 --- a/11.1/docker-entrypoint.sh +++ b/11.1/docker-entrypoint.sh @@ -222,7 +222,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.1.5-MariaDB" + echo -n "11.1.6-MariaDB" } # initializes the database directory diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh index 61f1799c..31d5391f 100755 --- a/11.2/docker-entrypoint.sh +++ b/11.2/docker-entrypoint.sh @@ -222,7 +222,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.2.4-MariaDB" + echo -n "11.2.5-MariaDB" } # initializes the database directory diff --git a/11.4-ubi/docker-entrypoint.sh b/11.4-ubi/docker-entrypoint.sh index de35bc16..4d2576de 100755 --- a/11.4-ubi/docker-entrypoint.sh +++ b/11.4-ubi/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.4.2-MariaDB" + echo -n "11.4.3-MariaDB" } # initializes the database directory diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh index de35bc16..4d2576de 100755 --- a/11.4/docker-entrypoint.sh +++ b/11.4/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.4.2-MariaDB" + echo -n "11.4.3-MariaDB" } # initializes the database directory diff --git a/versions.json b/versions.json index d1d5c275..6d21183b 100644 --- a/versions.json +++ b/versions.json @@ -1,8 +1,8 @@ { "11.4": { "milestone": "11.4", - "version": "11.4.2", - "fullVersion": "1:11.4.2+maria~ubu2404", + "version": "11.4.3", + "fullVersion": "1:11.4.3+maria~ubu2404", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:noble", @@ -15,8 +15,8 @@ }, "11.4-ubi": { "milestone": "11.4", - "version": "11.4.2", - "fullVersion": "11.4.2", + "version": "11.4.3", + "fullVersion": "11.4.3", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubi9", @@ -29,8 +29,8 @@ }, "11.2": { "milestone": "11.2", - "version": "11.2.4", - "fullVersion": "1:11.2.4+maria~ubu2204", + "version": "11.2.5", + "fullVersion": "1:11.2.5+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:jammy", @@ -43,8 +43,8 @@ }, "11.1": { "milestone": "11.1", - "version": "11.1.5", - "fullVersion": "1:11.1.5+maria~ubu2204", + "version": "11.1.6", + "fullVersion": "1:11.1.6+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:jammy", @@ -57,8 +57,8 @@ }, "10.11": { "milestone": "10.11", - "version": "10.11.8", - "fullVersion": "1:10.11.8+maria~ubu2204", + "version": "10.11.9", + "fullVersion": "1:10.11.9+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:jammy", @@ -71,8 +71,8 @@ }, "10.11-ubi": { "milestone": "10.11", - "version": "10.11.8", - "fullVersion": "10.11.8", + "version": "10.11.9", + "fullVersion": "10.11.9", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubi9", @@ -85,8 +85,8 @@ }, "10.6": { "milestone": "10.6", - "version": "10.6.18", - "fullVersion": "1:10.6.18+maria~ubu2004", + "version": "10.6.19", + "fullVersion": "1:10.6.19+maria~ubu2004", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:focal", @@ -99,8 +99,8 @@ }, "10.6-ubi": { "milestone": "10.6", - "version": "10.6.18", - "fullVersion": "10.6.18", + "version": "10.6.19", + "fullVersion": "10.6.19", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubi9", @@ -111,6 +111,20 @@ "s390x" ] }, + "10.5": { + "milestone": "10.5", + "version": "10.5.26", + "fullVersion": "1:10.5.26+maria~ubu2004", + "releaseStatus": "Stable", + "supportType": "Long Term Support", + "base": "ubuntu:focal", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] + }, "11.5": { "milestone": "11.5", "version": "11.5.2",