release 2024 q2

MariaDB · May 17, 2024 · bc74ae6 · bc74ae6
1 parent c86ba4c
commit bc74ae6
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 39 deletions.
diff --git a/10.11/Dockerfile b/10.11/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="10.11.7" \
+      org.opencontainers.image.version="10.11.8" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:10.11.7+maria~ubu2204
+ARG MARIADB_VERSION=1:10.11.8+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long 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-10.11.7/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.8/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/10.4/Dockerfile b/10.4/Dockerfile
@@ -75,20 +75,20 @@ 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="10.4.33" \
+      org.opencontainers.image.version="10.4.34" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ARG MARIADB_MAJOR=10.4
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.4.33+maria~ubu2004
+ARG MARIADB_VERSION=1:10.4.34+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long 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-10.4.33/repo/ubuntu/ focal main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.34/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/10.5/Dockerfile b/10.5/Dockerfile
@@ -75,20 +75,20 @@ 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="10.5.24" \
+      org.opencontainers.image.version="10.5.25" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.5
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.5.24+maria~ubu2004
+ARG MARIADB_VERSION=1:10.5.25+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long 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-10.5.24/repo/ubuntu/ focal main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.25/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/10.6/Dockerfile b/10.6/Dockerfile
@@ -75,20 +75,20 @@ 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="10.6.17" \
+      org.opencontainers.image.version="10.6.18" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.6
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.6.17+maria~ubu2004
+ARG MARIADB_VERSION=1:10.6.18+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long 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-10.6.17/repo/ubuntu/ focal main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.18/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/11.0/Dockerfile b/11.0/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.0.5" \
+      org.opencontainers.image.version="11.0.6" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.0.5+maria~ubu2204
+ARG MARIADB_VERSION=1:11.0.6+maria~ubu2204
 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.0.5/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.0.6/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/11.1/Dockerfile b/11.1/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.1.4" \
+      org.opencontainers.image.version="11.1.5" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.1.4+maria~ubu2204
+ARG MARIADB_VERSION=1:11.1.5+maria~ubu2204
 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.1.4/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.1.5/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/11.2/Dockerfile b/11.2/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.2.3" \
+      org.opencontainers.image.version="11.2.4" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.2.3+maria~ubu2204
+ARG MARIADB_VERSION=1:11.2.4+maria~ubu2204
 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.2.3/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.2.4/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

diff --git a/11.5/Dockerfile b/11.5/Dockerfile
@@ -81,7 +81,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_VERSION=1:11.5.0+maria~ubu2404
 ENV MARIADB_VERSION $MARIADB_VERSION
-# release-status:Alpha
+# release-status:RC
 # release-support-type:Short Term Support
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
@@ -125,8 +125,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+

diff --git a/versions.json b/versions.json
@@ -3,7 +3,7 @@
     "milestone": "11.5",
     "version": "11.5.0",
     "fullVersion": "1:11.5.0+maria~ubu2404",
-    "releaseStatus": "Alpha",
+    "releaseStatus": "RC",
     "supportType": "Short Term Support",
     "base": "ubuntu:noble",
     "arches": [
@@ -43,8 +43,8 @@
   },
   "11.2": {
     "milestone": "11.2",
-    "version": "11.2.3",
-    "fullVersion": "1:11.2.3+maria~ubu2204",
+    "version": "11.2.4",
+    "fullVersion": "1:11.2.4+maria~ubu2204",
     "releaseStatus": "Stable",
     "supportType": "Short Term Support",
     "base": "ubuntu:jammy",
@@ -57,8 +57,8 @@
   },
   "11.1": {
     "milestone": "11.1",
-    "version": "11.1.4",
-    "fullVersion": "1:11.1.4+maria~ubu2204",
+    "version": "11.1.5",
+    "fullVersion": "1:11.1.5+maria~ubu2204",
     "releaseStatus": "Stable",
     "supportType": "Short Term Support",
     "base": "ubuntu:jammy",
@@ -71,8 +71,8 @@
   },
   "11.0": {
     "milestone": "11.0",
-    "version": "11.0.5",
-    "fullVersion": "1:11.0.5+maria~ubu2204",
+    "version": "11.0.6",
+    "fullVersion": "1:11.0.6+maria~ubu2204",
     "releaseStatus": "Stable",
     "supportType": "Short Term Support",
     "base": "ubuntu:jammy",
@@ -85,8 +85,8 @@
   },
   "10.11": {
     "milestone": "10.11",
-    "version": "10.11.7",
-    "fullVersion": "1:10.11.7+maria~ubu2204",
+    "version": "10.11.8",
+    "fullVersion": "1:10.11.8+maria~ubu2204",
     "releaseStatus": "Stable",
     "supportType": "Long Term Support",
     "base": "ubuntu:jammy",
@@ -99,8 +99,8 @@
   },
   "10.6": {
     "milestone": "10.6",
-    "version": "10.6.17",
-    "fullVersion": "1:10.6.17+maria~ubu2004",
+    "version": "10.6.18",
+    "fullVersion": "1:10.6.18+maria~ubu2004",
     "releaseStatus": "Stable",
     "supportType": "Long Term Support",
     "base": "ubuntu:focal",
@@ -113,8 +113,8 @@
   },
   "10.5": {
     "milestone": "10.5",
-    "version": "10.5.24",
-    "fullVersion": "1:10.5.24+maria~ubu2004",
+    "version": "10.5.25",
+    "fullVersion": "1:10.5.25+maria~ubu2004",
     "releaseStatus": "Stable",
     "supportType": "Long Term Support",
     "base": "ubuntu:focal",
@@ -127,8 +127,8 @@
   },
   "10.4": {
     "milestone": "10.4",
-    "version": "10.4.33",
-    "fullVersion": "1:10.4.33+maria~ubu2004",
+    "version": "10.4.34",
+    "fullVersion": "1:10.4.34+maria~ubu2004",
     "releaseStatus": "Stable",
     "supportType": "Long Term Support",
     "base": "ubuntu:focal",