From 853447019725b35685d5ec3c007096a266399bea Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 14 Feb 2025 17:47:43 +1100 Subject: [PATCH] 11.7.2 Stable With a few manual hacks on version. --- 11.7-ubi/Dockerfile | 10 +++++----- 11.7-ubi/docker-entrypoint.sh | 2 +- 11.7/Dockerfile | 8 ++++---- 11.7/docker-entrypoint.sh | 2 +- update.sh | 4 ++-- versions.json | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/11.7-ubi/Dockerfile b/11.7-ubi/Dockerfile index 572ff0d6..5f0bee25 100644 --- a/11.7-ubi/Dockerfile +++ b/11.7-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.7.1" \ + version="11.7.2" \ release="Refer to Annotations org.opencontainers.image.{revision,source}" \ summary="MariaDB Database" \ description="MariaDB Database for relational SQL" @@ -50,13 +50,13 @@ 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.7.1" \ + org.opencontainers.image.version="11.7.2" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=11.7.1 +ARG MARIADB_VERSION=11.7.2 ENV MARIADB_VERSION=$MARIADB_VERSION -# release-status:RC +# release-status:Stable # release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -83,7 +83,7 @@ RUN set -eux ; \ unset GNUPGHOME ; \ microdnf update -y ; \ microdnf reinstall -y tzdata ; \ - microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ + microdnf install -y procps-ng zstd xz jemalloc pwgen pv util-linux-core ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ diff --git a/11.7-ubi/docker-entrypoint.sh b/11.7-ubi/docker-entrypoint.sh index 92d280cb..8c835227 100755 --- a/11.7-ubi/docker-entrypoint.sh +++ b/11.7-ubi/docker-entrypoint.sh @@ -225,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.7.1-MariaDB" + echo -n "11.7.2-MariaDB" } # initializes the database directory diff --git a/11.7/Dockerfile b/11.7/Dockerfile index 246b977c..78bc8a72 100644 --- a/11.7/Dockerfile +++ b/11.7/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.7.1" \ + org.opencontainers.image.version="11.7.2" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.7.1+maria~ubu2404 +ARG MARIADB_VERSION=1:11.7.2+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION -# release-status:RC +# release-status:Stable # release-support-type:Short 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.7.1/repo/ubuntu/ noble main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.7.2/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.7/docker-entrypoint.sh b/11.7/docker-entrypoint.sh index 92d280cb..8c835227 100755 --- a/11.7/docker-entrypoint.sh +++ b/11.7/docker-entrypoint.sh @@ -225,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.7.1-MariaDB" + echo -n "11.7.2-MariaDB" } # initializes the database directory diff --git a/update.sh b/update.sh index 54291fdc..83b9ac86 100755 --- a/update.sh +++ b/update.sh @@ -187,7 +187,7 @@ mariaversion() { if [ "$version" = 11.7 ]; then #version=11.7 - mariaVersion=11.7.1; + mariaVersion=11.7.2; return fi mariaVersion=$(curl -fsSL "$DOWNLOADS_REST_API/mariadb/${version%-*}" \ @@ -247,7 +247,7 @@ for version in "${versions[@]}"; do case "$version" in 11.7) - releaseStatus=${release[0]:-RC} + releaseStatus=${release[0]:-Stable} supportType=${release[1]:-Short Term Support} ;; 11.6) diff --git a/versions.json b/versions.json index 2c90a20a..1971362d 100644 --- a/versions.json +++ b/versions.json @@ -155,9 +155,9 @@ }, "11.7": { "milestone": "11.7", - "version": "11.7.1", - "fullVersion": "1:11.7.1+maria~ubu2404", - "releaseStatus": "RC", + "version": "11.7.2", + "fullVersion": "1:11.7.2+maria~ubu2404", + "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:noble", "arches": [ @@ -169,9 +169,9 @@ }, "11.7-ubi": { "milestone": "11.7", - "version": "11.7.1", - "fullVersion": "11.7.1", - "releaseStatus": "RC", + "version": "11.7.2", + "fullVersion": "11.7.2", + "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubi9", "arches": [