admin/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

chore(deps): update MariaDB to v11.8 (LTS) (#1715)

Browse Source 
* chore(deps): update MariaDB to v11.8 (LTS)

* fix(mariadb): replaced deprecated mysqladmin

* feat(mariadb): make use of healthcheck.sh
This commit is contained in:
DanielRadlAMR
2025-09-29 08:07:17 +02:00
committed by GitHub
parent 1688a55d93
commit 72b8d262c9
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devcontainer-example/docker-compose.yml
View File

@@ -1,7 +1,7 @@
version: "3.7" version: "3.7"
services: services:
mariadb: mariadb:
image: docker.io/mariadb:10.6 image: docker.io/mariadb:11.8
command: command:
- --character-set-server=utf8mb4 - --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci - --collation-server=utf8mb4_unicode_ci
@@ -9,6 +9,7 @@ services:
- --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
environment: environment:
MYSQL_ROOT_PASSWORD: 123 MYSQL_ROOT_PASSWORD: 123
MARIADB_AUTO_UPGRADE: 1
volumes: volumes:
- mariadb-data:/var/lib/mysql - mariadb-data:/var/lib/mysql

2
overrides/compose.mariadb-secrets.yaml
View File

@@ -3,8 +3,6 @@ services:
environment: environment:
MYSQL_ROOT_PASSWORD: !reset null MYSQL_ROOT_PASSWORD: !reset null
MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_password MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_password
healthcheck:
test: mysqladmin ping -h localhost --password="$(cat /run/secrets/db_password)"
secrets: secrets:
- db_password - db_password

11
overrides/compose.mariadb-shared.yaml
View File

@@ -3,12 +3,14 @@ version: "3.3"
services: services:
database: database:
container_name: mariadb-database container_name: mariadb-database
image: mariadb:10.6 image: mariadb:11.8
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-changeit} test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
interval: 1s start_period: 5s
retries: 20 interval: 5s
timeout: 5s
retries: 5
command: command:
- --character-set-server=utf8mb4 - --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci - --collation-server=utf8mb4_unicode_ci
@@ -16,6 +18,7 @@ services:
- --skip-innodb-read-only-compressed - --skip-innodb-read-only-compressed
environment: environment:
MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit} MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit}
MARIADB_AUTO_UPGRADE: 1
volumes: volumes:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
networks: networks:

11
overrides/compose.mariadb.yaml
View File

@@ -8,11 +8,13 @@ services:
condition: service_healthy condition: service_healthy
db: db:
image: mariadb:10.6 image: mariadb:11.8
healthcheck: healthcheck:
test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-123} test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
interval: 1s start_period: 5s
retries: 20 interval: 5s
timeout: 5s
retries: 5
restart: unless-stopped restart: unless-stopped
command: command:
- --character-set-server=utf8mb4 - --character-set-server=utf8mb4
@@ -21,6 +23,7 @@ services:
- --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
environment: environment:
MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-123} MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-123}
MARIADB_AUTO_UPGRADE: 1
volumes: volumes:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql