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

fix(mariadb): replaced deprecated mysqladmin

Browse source
This commit is contained in:
Daniel Radl 2025-09-24 12:57:15 +02:00
parent 79dff2dd48
commit d23176ca34
4 changed files with 7 additions and 4 deletions
Show stats 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

@ -4,7 +4,7 @@ services:
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: 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: secrets:
- db_password - db_password

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

@ -6,7 +6,7 @@ services:
image: mariadb:11.8 image: mariadb:11.8
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-changeit} test: mariadb-admin ping -h localhost --password=${DB_PASSWORD:-changeit}
interval: 1s interval: 1s
retries: 20 retries: 20
command: command:
@ -16,6 +16,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:

3
overrides/compose.mariadb.yaml
View file

@ -10,7 +10,7 @@ services:
db: db:
image: mariadb:11.8 image: mariadb:11.8
healthcheck: healthcheck:
test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-123} test: mariadb-admin ping -h localhost --password=${DB_PASSWORD:-123}
interval: 1s interval: 1s
retries: 20 retries: 20
restart: unless-stopped restart: unless-stopped
@ -21,6 +21,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