From c801951f3d450cb22d1d1f8d3a6a1f14cea99d4f Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 15 Aug 2024 14:05:28 +1000
Subject: [PATCH] Remove out 11.6 vector as the primary version
---
11.6-ubi/Dockerfile | 6 +++---
update.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/11.6-ubi/Dockerfile b/11.6-ubi/Dockerfile
index 8380f3c..46e67ba 100644
--- a/11.6-ubi/Dockerfile
+++ b/11.6-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.6.0 Vector" \
+ version="11.6.0" \
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.6.0 Vector" \
+ org.opencontainers.image.version="11.6.0" \
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=11.6.0 Vector
+ARG MARIADB_VERSION=11.6.0
ENV MARIADB_VERSION=$MARIADB_VERSION
# release-status:Unknown
# release-support-type:Unknown
diff --git a/update.sh b/update.sh
index 3ef526b..4055f78 100755
--- a/update.sh
+++ b/update.sh
@@ -193,7 +193,7 @@ update_version_array()
mariaversion()
{
mariaVersion=$(curl -fsSL "$DOWNLOADS_REST_API/mariadb/${version%-*}" \
- | jq -r 'first(.releases[]).release_id')
+ | jq -r 'first(.releases[] | .release_id | select(. | test("[0-9]+.[0-9]+.[0-9]+$")))')
mariaVersion=${mariaVersion//\"}
}
--
GitLab