Fixes #6761 -- Update MariaDB version.

CHANGELOG.md

@@ -14,6 +14,8 @@ release channel, you can take advantage of these new features and fixes.
 
 ## Code Quality/Technical Changes
 
+- MariaDB has been updated to 11.2. Databases will automatically be upgraded on the first boot after updating.
+
 - If you upload media to a folder and that folder is set to auto-assign to a playlist, the media will *instantly* be a
   part of that playlist, not subject to a sync task delay; this should greatly improve the user experience when using
   this feature.

Dockerfile

@@ -15,7 +15,7 @@ RUN go install github.com/centrifugal/centrifugo/v5@v5.1.2
 #
 # MariaDB dependencies build step
 #
-FROM mariadb:10.9-jammy AS mariadb
+FROM mariadb:11.2-jammy AS mariadb
 
 #
 # Final build image
@@ -32,6 +32,8 @@ COPY --from=go-dependencies /go/bin/centrifugo /usr/local/bin/centrifugo
 # Add MariaDB dependencies
 COPY --from=mariadb /usr/local/bin/healthcheck.sh /usr/local/bin/db_healthcheck.sh
 COPY --from=mariadb /usr/local/bin/docker-entrypoint.sh /usr/local/bin/db_entrypoint.sh
+COPY --from=mariadb /etc/apt/sources.list.d/mariadb.list /etc/apt/sources.list.d/mariadb.list
+COPY --from=mariadb /etc/apt/trusted.gpg.d/mariadb.gpg /etc/apt/trusted.gpg.d/mariadb.gpg
 
 # Run base build process
 COPY ./util/docker/common /bd_build/

util/docker/mariadb/service.minimal/mariadb.conf

@@ -1,5 +1,5 @@
 [program:mariadb]
-command=mysqld
+command=mariadbd
 user=mysql
 priority=100
 numprocs=1

util/docker/mariadb/setup/mariadb.sh

@@ -2,20 +2,21 @@
 set -e
 set -x
 
-apt-get install -q -y --no-install-recommends apt-transport-https curl
-
-curl -o /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc 'https://mariadb.org/mariadb_release_signing_key.asc'
-echo 'deb https://atl.mirrors.knownhost.com/mariadb/repo/10.9/ubuntu jammy main' >> /etc/apt/sources.list
-
-apt-get update
+{
+    echo 'Package: *'; \
+    echo 'Pin: release o=MariaDB'; \
+    echo 'Pin-Priority: 999'; \
+} > /etc/apt/preferences.d/mariadb
 
 { \
 		echo "mariadb-server" mysql-server/root_password password 'unused'; \
 		echo "mariadb-server" mysql-server/root_password_again password 'unused'; \
 } | debconf-set-selections
 
+apt-get update
+
 apt-get install -q -y --no-install-recommends \
-  mariadb-server.10.9 mariadb-backup \
+  mariadb-server mariadb-backup \
   ca-certificates gpg gpgv libjemalloc2 pwgen tzdata xz-utils zstd
 
 rm -rf /var/lib/mysql

util/docker/mariadb/startup_scripts/05_setup_db.sh

@@ -9,7 +9,7 @@ export MARIADB_AUTO_UPGRADE=1
 
 source /usr/local/bin/db_entrypoint.sh
 
-set -- mysqld
+set -- mariadbd
 
 mysql_note "Initial DB setup..."