From 51412843942dd3f5ded1f3b5e78f6c7420c48fc4 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 16 Sep 2024 17:39:47 +1000 Subject: [PATCH] main: 11.7 currently --- main-ubi/Dockerfile | 6 +++--- main-ubi/docker-entrypoint.sh | 2 +- main/Dockerfile | 6 +++--- main/docker-entrypoint.sh | 2 +- update.sh | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/main-ubi/Dockerfile b/main-ubi/Dockerfile index 7be4e69..c4c7b7b 100644 --- a/main-ubi/Dockerfile +++ b/main-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="main.0" \ + version="11.7.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="main.0" \ + org.opencontainers.image.version="11.7.0" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=main.0 +ARG MARIADB_VERSION=11.7.0 ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Alpha # release-support-type:Unknown diff --git a/main-ubi/docker-entrypoint.sh b/main-ubi/docker-entrypoint.sh index 6e27486..1ae157e 100755 --- a/main-ubi/docker-entrypoint.sh +++ b/main-ubi/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "main.0-MariaDB" + echo -n "11.7.0-MariaDB" } # initializes the database directory diff --git a/main/Dockerfile b/main/Dockerfile index 3ccc1c0..4e59706 100644 --- a/main/Dockerfile +++ b/main/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="main.0" \ + org.opencontainers.image.version="11.7.0" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:main.0+maria~ubu2404 +ARG MARIADB_VERSION=1:11.7.0+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION # release-status:Alpha # release-support-type:Unknown # (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-main.0/repo/ubuntu/ noble main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.7.0/repo/ubuntu/ noble main main/debug" RUN set -e;\ echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \ diff --git a/main/docker-entrypoint.sh b/main/docker-entrypoint.sh index 6e27486..1ae157e 100755 --- a/main/docker-entrypoint.sh +++ b/main/docker-entrypoint.sh @@ -224,7 +224,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "main.0-MariaDB" + echo -n "11.7.0-MariaDB" } # initializes the database directory diff --git a/update.sh b/update.sh index d71f517..2ca1477 100755 --- a/update.sh +++ b/update.sh @@ -5,6 +5,7 @@ set -Eeuo pipefail # development_version=main +development_version_real=11.7 defaultSuite='noble' declare -A suites=( @@ -204,7 +205,7 @@ in_development() releaseStatus=Alpha supportType=Unknown version=$development_version - mariaVersion=${development_version}.0 + mariaVersion=${development_version_real}.0 update_version }