diff --git a/11.5-ubi/Dockerfile b/11.5-ubi/Dockerfile index 6dbc85cd925d76290b305cc218b58d4d4575af26..32355e7e6465e51625c5d5dee0f80a2d4d8de571 100644 --- a/11.5-ubi/Dockerfile +++ b/11.5-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.5.1" \ + version="11.5.2" \ 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.5.1" \ + org.opencontainers.image.version="11.5.2" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=11.5.1 +ARG MARIADB_VERSION=11.5.2 ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Stable # release-support-type:Short Term Support diff --git a/11.5-ubi/docker-entrypoint.sh b/11.5-ubi/docker-entrypoint.sh index c61086579c21fce9d6861ebb138524b0f97252aa..833b08b006bf2c1ee4bcc7948865cf037d29fe69 100755 --- a/11.5-ubi/docker-entrypoint.sh +++ b/11.5-ubi/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.5.1-MariaDB" + echo -n "11.5.2-MariaDB" } # initializes the database directory diff --git a/11.5/Dockerfile b/11.5/Dockerfile index 6a04d06d420f6c7a7133ea4b2e0ed62665cb7ace..a394eb879130496d60fd3355519419cddd8b3648 100644 --- a/11.5/Dockerfile +++ b/11.5/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.5.1" \ + org.opencontainers.image.version="11.5.2" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.5.1+maria~ubu2404 +ARG MARIADB_VERSION=1:11.5.2+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION # 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.5.1/repo/ubuntu/ noble main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.5.2/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh index c61086579c21fce9d6861ebb138524b0f97252aa..833b08b006bf2c1ee4bcc7948865cf037d29fe69 100755 --- a/11.5/docker-entrypoint.sh +++ b/11.5/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.5.1-MariaDB" + echo -n "11.5.2-MariaDB" } # initializes the database directory diff --git a/11.6-ubi/Dockerfile b/11.6-ubi/Dockerfile index a059b835a2ad3c1eb57301810da18b0198c59806..d205b3f002287a67ceea14e0a47d316ed94fafbe 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" \ + version="11.6.1" \ 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" \ + org.opencontainers.image.version="11.6.1" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=11.6.0 +ARG MARIADB_VERSION=11.6.1 ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:RC # release-support-type:Short Term Support diff --git a/11.6-ubi/docker-entrypoint.sh b/11.6-ubi/docker-entrypoint.sh index ddb2874f920bb9e4b62ac951cba54dd0a5c301c2..754d4db87728f946e4d044dad7affe1aae374f91 100755 --- a/11.6-ubi/docker-entrypoint.sh +++ b/11.6-ubi/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.6.0-MariaDB" + echo -n "11.6.1-MariaDB" } # initializes the database directory diff --git a/11.6/Dockerfile b/11.6/Dockerfile index e3f5b28bbb64821ace9baeeabc7f4dd62ea4fe68..ffc341a3ce4d2323fca0d9d9ef3de72e0c93bb3b 100644 --- a/11.6/Dockerfile +++ b/11.6/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.6.0" \ + org.opencontainers.image.version="11.6.1" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.6.0+maria~ubu2404 +ARG MARIADB_VERSION=1:11.6.1+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:RC # 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.6.0/repo/ubuntu/ noble main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.6.1/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/11.6/docker-entrypoint.sh b/11.6/docker-entrypoint.sh index ddb2874f920bb9e4b62ac951cba54dd0a5c301c2..754d4db87728f946e4d044dad7affe1aae374f91 100755 --- a/11.6/docker-entrypoint.sh +++ b/11.6/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.6.0-MariaDB" + echo -n "11.6.1-MariaDB" } # initializes the database directory diff --git a/update.sh b/update.sh index 746770097332dc5541c1d38e5855a448eea64418..61de8963b69fe77e09e62fb1eab71e08e48acb6d 100755 --- a/update.sh +++ b/update.sh @@ -240,7 +240,16 @@ for version in "${versions[@]}"; do if [ ! -d "$version" ]; then version=${version%.[[:digit:]]*} else - mariaversion + case "$version" in + 11.5*) + mariaVersion=11.5.2 + ;; + 11.6*) + mariaVersion=11.6.1 + ;; + *) + mariaversion + esac fi readarray -t release <<< "$(curl -fsSL "$DOWNLOADS_REST_API/mariadb/" \ | jq -r --arg version "${version%-*}" '.major_releases[] | select(.release_id == $version) | [ .release_status ] , [ .release_support_type ] | @tsv')" diff --git a/versions.json b/versions.json index b469b444a8802153557b5e42b7654bbf29b96e62..d1d5c275f49509f90924ba58e4cbfb25011b1b20 100644 --- a/versions.json +++ b/versions.json @@ -113,8 +113,8 @@ }, "11.5": { "milestone": "11.5", - "version": "11.5.1", - "fullVersion": "1:11.5.1+maria~ubu2404", + "version": "11.5.2", + "fullVersion": "1:11.5.2+maria~ubu2404", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubuntu:noble", @@ -127,8 +127,8 @@ }, "11.5-ubi": { "milestone": "11.5", - "version": "11.5.1", - "fullVersion": "11.5.1", + "version": "11.5.2", + "fullVersion": "11.5.2", "releaseStatus": "Stable", "supportType": "Short Term Support", "base": "ubi9", @@ -141,8 +141,8 @@ }, "11.6": { "milestone": "11.6", - "version": "11.6.0", - "fullVersion": "1:11.6.0+maria~ubu2404", + "version": "11.6.1", + "fullVersion": "1:11.6.1+maria~ubu2404", "releaseStatus": "RC", "supportType": "Short Term Support", "base": "ubuntu:noble", @@ -155,8 +155,8 @@ }, "11.6-ubi": { "milestone": "11.6", - "version": "11.6.0", - "fullVersion": "11.6.0", + "version": "11.6.1", + "fullVersion": "11.6.1", "releaseStatus": "RC", "supportType": "Short Term Support", "base": "ubi9",