diff --git a/main-ubi/Dockerfile b/main-ubi/Dockerfile index c4c7b7bdd3f42acd206e058142835e4d5cad65ca..572ff0d6c928c809cb0e16c3a8abf536bf61f706 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 d3bf557f2c01618888bbdcc92e5af9e77b042f1e..92d280cbc3a203030b47332d692ab9c077af1306 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 4e59706dbc739ae19422dba01d90d5f10b2c4304..246b977c3d5d1323a47ab0f47bbe797c176137ed 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 d3bf557f2c01618888bbdcc92e5af9e77b042f1e..92d280cbc3a203030b47332d692ab9c077af1306 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 48e93483964881500175663f6c040ffcecaef423..95fea0fa0ad6526926a5f85e2958357cd91113e0 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