From a272347802e1764dd8c0e15ba2b2abfeeadb3bb6 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 22 May 2025 09:31:53 +1000 Subject: [PATCH] 10.11.13 and 11.4.7 re-release --- 10.11-ubi/Dockerfile | 6 +++--- 10.11-ubi/docker-entrypoint.sh | 2 +- 10.11/Dockerfile | 6 +++--- 10.11/docker-entrypoint.sh | 2 +- 11.4-ubi/Dockerfile | 6 +++--- 11.4-ubi/docker-entrypoint.sh | 2 +- 11.4/Dockerfile | 6 +++--- 11.4/docker-entrypoint.sh | 2 +- update.sh | 12 ++++++++++++ versions.json | 16 ++++++++-------- 10 files changed, 36 insertions(+), 24 deletions(-) diff --git a/10.11-ubi/Dockerfile b/10.11-ubi/Dockerfile index 0581513..d1277c3 100644 --- a/10.11-ubi/Dockerfile +++ b/10.11-ubi/Dockerfile @@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/ # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images LABEL name="MariaDB Server" \ vendor="MariaDB Community" \ - version="10.11.12" \ + version="10.11.13" \ release="Refer to Annotations org.opencontainers.image.{revision,source}" \ summary="MariaDB Database" \ description="MariaDB Database for relational SQL" @@ -50,11 +50,11 @@ 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.12" \ + org.opencontainers.image.version="10.11.13" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=10.11.12 +ARG MARIADB_VERSION=10.11.13 ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support diff --git a/10.11-ubi/docker-entrypoint.sh b/10.11-ubi/docker-entrypoint.sh index fb7df6a..5d6ec87 100755 --- a/10.11-ubi/docker-entrypoint.sh +++ b/10.11-ubi/docker-entrypoint.sh @@ -223,7 +223,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.11.12-MariaDB" + echo -n "10.11.13-MariaDB" } # initializes the database directory diff --git a/10.11/Dockerfile b/10.11/Dockerfile index d9b3a11..1755eaa 100644 --- a/10.11/Dockerfile +++ b/10.11/Dockerfile @@ -75,18 +75,18 @@ 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.12" \ + org.opencontainers.image.version="10.11.13" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:10.11.12+maria~ubu2204 +ARG MARIADB_VERSION=1:10.11.13+maria~ubu2204 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.12/repo/ubuntu/ jammy main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.13/repo/ubuntu/ jammy main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index fb7df6a..5d6ec87 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -223,7 +223,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "10.11.12-MariaDB" + echo -n "10.11.13-MariaDB" } # initializes the database directory diff --git a/11.4-ubi/Dockerfile b/11.4-ubi/Dockerfile index 2ef3db4..042cd65 100644 --- a/11.4-ubi/Dockerfile +++ b/11.4-ubi/Dockerfile @@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/ # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images LABEL name="MariaDB Server" \ vendor="MariaDB Community" \ - version="11.4.6" \ + version="11.4.7" \ release="Refer to Annotations org.opencontainers.image.{revision,source}" \ summary="MariaDB Database" \ description="MariaDB Database for relational SQL" @@ -50,11 +50,11 @@ 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="11.4.6" \ + org.opencontainers.image.version="11.4.7" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=11.4.6 +ARG MARIADB_VERSION=11.4.7 ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support diff --git a/11.4-ubi/docker-entrypoint.sh b/11.4-ubi/docker-entrypoint.sh index 29ea23f..9dc6197 100755 --- a/11.4-ubi/docker-entrypoint.sh +++ b/11.4-ubi/docker-entrypoint.sh @@ -225,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.4.6-MariaDB" + echo -n "11.4.7-MariaDB" } # initializes the database directory diff --git a/11.4/Dockerfile b/11.4/Dockerfile index 24a301c..bf5fe5d 100644 --- a/11.4/Dockerfile +++ b/11.4/Dockerfile @@ -75,18 +75,18 @@ 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="11.4.6" \ + org.opencontainers.image.version="11.4.7" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.4.6+maria~ubu2404 +ARG MARIADB_VERSION=1:11.4.7+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions -ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.4.6/repo/ubuntu/ noble main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.4.7/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh index 29ea23f..9dc6197 100755 --- a/11.4/docker-entrypoint.sh +++ b/11.4/docker-entrypoint.sh @@ -225,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.4.6-MariaDB" + echo -n "11.4.7-MariaDB" } # initializes the database directory diff --git a/update.sh b/update.sh index 885a61b..55e3971 100755 --- a/update.sh +++ b/update.sh @@ -186,11 +186,23 @@ update_version_array() mariaversion() { + # version hacks because our $DOWNLOADS_REST_API + # seems to never be right on release and has unfinshed suppport + # for rolling release versions. if [ "$version" = 11.7 ]; then #version=11.7 mariaVersion=11.7.2; return fi + # re-release + if [ "$version" = 10.11 ]; then + mariaVersion=10.11.13; + return + fi + if [ "$version" = 11.4 ]; then + mariaVersion=11.4.7; + return + fi mariaVersion=$(curl -fsSL "$DOWNLOADS_REST_API/mariadb/${version%-*}" \ | jq -r 'first(.releases[] | .release_id | select(. | test("[0-9]+.[0-9]+.[0-9]+$")))') mariaVersion=${mariaVersion//\"} diff --git a/versions.json b/versions.json index 259dfc8..88778f2 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ }, "11.4": { "milestone": "11.4", - "version": "11.4.6", - "fullVersion": "1:11.4.6+maria~ubu2404", + "version": "11.4.7", + "fullVersion": "1:11.4.7+maria~ubu2404", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:noble", @@ -43,8 +43,8 @@ }, "11.4-ubi": { "milestone": "11.4", - "version": "11.4.6", - "fullVersion": "11.4.6", + "version": "11.4.7", + "fullVersion": "11.4.7", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubi9", @@ -57,8 +57,8 @@ }, "10.11": { "milestone": "10.11", - "version": "10.11.12", - "fullVersion": "1:10.11.12+maria~ubu2204", + "version": "10.11.13", + "fullVersion": "1:10.11.13+maria~ubu2204", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubuntu:jammy", @@ -71,8 +71,8 @@ }, "10.11-ubi": { "milestone": "10.11", - "version": "10.11.12", - "fullVersion": "10.11.12", + "version": "10.11.13", + "fullVersion": "10.11.13", "releaseStatus": "Stable", "supportType": "Long Term Support", "base": "ubi9",