From 9cecbc7b2de8dc9d410ea30f7c34576a42f8b366 Mon Sep 17 00:00:00 2001 From: jslocomotor <210083531+jslocomotor@users.noreply.github.com> Date: Sat, 18 Apr 2026 21:18:22 +0200 Subject: [PATCH] chore(compose): use MariaDB 11.8 and remove obsolete MariaDB 10.6 workaround --- devcontainer-example/docker-compose.yml | 1 - docs/01-getting-started/03-arm64.md | 3 +-- overrides/compose.mariadb-shared.yaml | 1 - overrides/compose.mariadb.yaml | 1 - pwd.yml | 3 +-- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index 3c23b4f3..bf3bbf72 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -5,7 +5,6 @@ services: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci - --skip-character-set-client-handshake - - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 environment: MYSQL_ROOT_PASSWORD: 123 MARIADB_AUTO_UPGRADE: 1 diff --git a/docs/01-getting-started/03-arm64.md b/docs/01-getting-started/03-arm64.md index c76beb06..b9defd89 100644 --- a/docs/01-getting-started/03-arm64.md +++ b/docs/01-getting-started/03-arm64.md @@ -100,7 +100,7 @@ services: bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; db: - image: mariadb:10.6 + image: mariadb:11.8 platform: linux/amd64 healthcheck: test: mysqladmin ping -h localhost --password=admin @@ -113,7 +113,6 @@ services: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci - --skip-character-set-client-handshake - - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 environment: MYSQL_ROOT_PASSWORD: admin volumes: diff --git a/overrides/compose.mariadb-shared.yaml b/overrides/compose.mariadb-shared.yaml index f28031c0..0c815007 100644 --- a/overrides/compose.mariadb-shared.yaml +++ b/overrides/compose.mariadb-shared.yaml @@ -13,7 +13,6 @@ services: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci - --skip-character-set-client-handshake - - --skip-innodb-read-only-compressed environment: MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit} MARIADB_AUTO_UPGRADE: 1 diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml index e79288c0..94e177c3 100644 --- a/overrides/compose.mariadb.yaml +++ b/overrides/compose.mariadb.yaml @@ -20,7 +20,6 @@ services: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci - --skip-character-set-client-handshake - - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 environment: MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-123} MARIADB_AUTO_UPGRADE: 1 diff --git a/pwd.yml b/pwd.yml index 612344db..4cb9b474 100644 --- a/pwd.yml +++ b/pwd.yml @@ -78,7 +78,7 @@ services: bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-username=root --db-root-password=admin --install-app erpnext --set-default frontend; db: - image: mariadb:10.6 + image: mariadb:11.8 networks: - frappe_network healthcheck: @@ -92,7 +92,6 @@ services: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci - --skip-character-set-client-handshake - - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 environment: MYSQL_ROOT_PASSWORD: admin MARIADB_ROOT_PASSWORD: admin