Skip to content

Commit

Permalink
11.7.2 Stable
Browse files Browse the repository at this point in the history
With a few manual hacks on version.
  • Loading branch information
grooverdan committed Feb 14, 2025
1 parent 2d51039 commit 8534470
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
10 changes: 5 additions & 5 deletions 11.7-ubi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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/)

Expand All @@ -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} ; \
Expand Down
2 changes: 1 addition & 1 deletion 11.7-ubi/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions 11.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion 11.7/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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%-*}" \
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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": [
Expand Down

0 comments on commit 8534470

Please sign in to comment.