epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-21 15:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat(mariadb): make use of healthcheck.sh

Browse source
This commit is contained in:
Daniel Radl 2025-09-24 13:46:43 +02:00
parent d23176ca34
commit 2be02ab112
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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: mariadb-admin ping -h localhost --password="$(cat /run/secrets/db_password)"
secrets: secrets:
- db_password - db_password

8
overrides/compose.mariadb-shared.yaml
View file

@ -6,9 +6,11 @@ services:
image: mariadb:11.8 image: mariadb:11.8
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: mariadb-admin 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

8
overrides/compose.mariadb.yaml
View file

@ -10,9 +10,11 @@ services:
db: db:
image: mariadb:11.8 image: mariadb:11.8
healthcheck: healthcheck:
test: mariadb-admin 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