From 33c919d2bb0cda6ee5031d048e4fec8963557b07 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 22 Nov 2024 09:36:25 +1100 Subject: [PATCH 1/3] tmp: version hacks on update.sh --- main-ubi/Dockerfile | 10 +++++----- main-ubi/docker-entrypoint.sh | 2 +- main/Dockerfile | 10 +++++----- main/docker-entrypoint.sh | 2 +- update.sh | 18 ++++++++++++------ 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/main-ubi/Dockerfile b/main-ubi/Dockerfile index c4c7b7bd..572ff0d6 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="11.7.0" \ + version="11.7.1" \ release="Refer to Annotations org.opencontainers.image.{revision,source}" \ summary="MariaDB Database" \ description="MariaDB Database for relational SQL" @@ -50,14 +50,14 @@ 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.0" \ + org.opencontainers.image.version="11.7.1" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=11.7.0 +ARG MARIADB_VERSION=11.7.1 ENV MARIADB_VERSION=$MARIADB_VERSION -# release-status:Alpha -# release-support-type:Unknown +# release-status:RC +# release-support-type:Short Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) # missing pwgen(epel), jemalloc(epel) (as entrypoint/user extensions) diff --git a/main-ubi/docker-entrypoint.sh b/main-ubi/docker-entrypoint.sh index d3bf557f..92d280cb 100755 --- a/main-ubi/docker-entrypoint.sh +++ b/main-ubi/docker-entrypoint.sh @@ -225,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.7.0-MariaDB" + echo -n "11.7.1-MariaDB" } # initializes the database directory diff --git a/main/Dockerfile b/main/Dockerfile index 4e59706d..246b977c 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="11.7.0" \ + org.opencontainers.image.version="11.7.1" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=1:11.7.0+maria~ubu2404 +ARG MARIADB_VERSION=1:11.7.1+maria~ubu2404 ENV MARIADB_VERSION $MARIADB_VERSION -# release-status:Alpha -# release-support-type:Unknown +# 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.7.0/repo/ubuntu/ noble main main/debug" +ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.7.1/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 d3bf557f..92d280cb 100755 --- a/main/docker-entrypoint.sh +++ b/main/docker-entrypoint.sh @@ -225,7 +225,7 @@ docker_create_db_directories() { } _mariadb_version() { - echo -n "11.7.0-MariaDB" + echo -n "11.7.1-MariaDB" } # initializes the database directory diff --git a/update.sh b/update.sh index 48e93483..95fea0fa 100755 --- a/update.sh +++ b/update.sh @@ -185,6 +185,11 @@ update_version_array() mariaversion() { + if [ "$version" = main ]; then + #version=11.7 + mariaVersion=11.7.1; + 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//\"} @@ -228,10 +233,6 @@ for version in "${versions[@]}"; do ubi= fi - if [ "${version%-*}" == $development_version ]; then - in_development - continue - fi if [ ! -d "$version" ]; then version=${version%.[[:digit:]]*} else @@ -239,8 +240,13 @@ for version in "${versions[@]}"; do 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')" - releaseStatus=${release[0]:-Stable} - supportType=${release[1]:-Short Term Support} + if [ "$version" = 'main' ]; then + releaseStatus=${release[0]:-RC} + supportType=${release[1]:-Short Term Support} + else + releaseStatus=${release[0]:-Stable} + supportType=${release[1]:-Short Term Support} + fi update_version done From 11234f6e095d034582e9aaa464e6655036a6b594 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 22 Nov 2024 09:42:52 +1100 Subject: [PATCH 2/3] 11.7.1 release --- versions.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/versions.json b/versions.json index a8a154e6..cb45e567 100644 --- a/versions.json +++ b/versions.json @@ -138,5 +138,33 @@ "ppc64le", "s390x" ] + }, + "main-ubi": { + "milestone": "main", + "version": "11.7.1", + "fullVersion": "11.7.1", + "releaseStatus": "RC", + "supportType": "Short Term Support", + "base": "ubi9", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] + }, + "main": { + "milestone": "main", + "version": "11.7.1", + "fullVersion": "1:11.7.1+maria~ubu2404", + "releaseStatus": "RC", + "supportType": "Short Term Support", + "base": "ubuntu:noble", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] } } From 40aabb9f1c736e992fa6a4dc4f68e356f932aa46 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 22 Nov 2024 09:43:04 +1100 Subject: [PATCH 3/3] generate - release main now --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 1171a44d..ca2c037a 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -GLOBIGNORE=examples/:.*/:test/:main/:main-ubi/ +GLOBIGNORE=examples/:.*/:test/ err() { echo >&2 "ERROR: $*"