From d23176ca3452479c4260f55d50e75c663616acc2 Mon Sep 17 00:00:00 2001
From: Daniel Radl <daniel.radl@amr.at>
Date: Wed, 24 Sep 2025 12:57:15 +0200
Subject: [PATCH] fix(mariadb): replaced deprecated mysqladmin

---
 devcontainer-example/docker-compose.yml | 3 ++-
 overrides/compose.mariadb-secrets.yaml  | 2 +-
 overrides/compose.mariadb-shared.yaml   | 3 ++-
 overrides/compose.mariadb.yaml          | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml
index 0a614cbf..0d6d9d8a 100644
--- a/devcontainer-example/docker-compose.yml
+++ b/devcontainer-example/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   mariadb:
-    image: docker.io/mariadb:10.6
+    image: docker.io/mariadb:11.8
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
@@ -9,6 +9,7 @@ services:
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
       MYSQL_ROOT_PASSWORD: 123
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - mariadb-data:/var/lib/mysql
 
diff --git a/overrides/compose.mariadb-secrets.yaml b/overrides/compose.mariadb-secrets.yaml
index a8172431..af7e47bd 100644
--- a/overrides/compose.mariadb-secrets.yaml
+++ b/overrides/compose.mariadb-secrets.yaml
@@ -4,7 +4,7 @@ services:
       MYSQL_ROOT_PASSWORD: !reset null
       MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_password
     healthcheck:
-      test: mysqladmin ping -h localhost --password="$(cat /run/secrets/db_password)"
+      test: mariadb-admin ping -h localhost --password="$(cat /run/secrets/db_password)"
     secrets:
       - db_password
 
diff --git a/overrides/compose.mariadb-shared.yaml b/overrides/compose.mariadb-shared.yaml
index 07aac314..48c85700 100644
--- a/overrides/compose.mariadb-shared.yaml
+++ b/overrides/compose.mariadb-shared.yaml
@@ -6,7 +6,7 @@ services:
     image: mariadb:11.8
     restart: unless-stopped
     healthcheck:
-      test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-changeit}
+      test: mariadb-admin ping -h localhost --password=${DB_PASSWORD:-changeit}
       interval: 1s
       retries: 20
     command:
@@ -16,6 +16,7 @@ services:
       - --skip-innodb-read-only-compressed
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit}
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - db-data:/var/lib/mysql
     networks:
diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml
index 90f09560..d24e2da2 100644
--- a/overrides/compose.mariadb.yaml
+++ b/overrides/compose.mariadb.yaml
@@ -10,7 +10,7 @@ services:
   db:
     image: mariadb:11.8
     healthcheck:
-      test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-123}
+      test: mariadb-admin ping -h localhost --password=${DB_PASSWORD:-123}
       interval: 1s
       retries: 20
     restart: unless-stopped
@@ -21,6 +21,7 @@ services:
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-123}
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - db-data:/var/lib/mysql