Compare commits

...

2 commits
new-1 ... main

Author SHA1 Message Date
fd8e5a81a5 compose: fix healthcheck of mariadb (#1)
ariadb 11.X removed the mysql command and is now using the mariadb command instead.

This PR changes the behavior of the healthcheck inside compose.yml accordingly.

The mysql command was a symlink beginning with 10.5 to mariadb command (see https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-10-5/#binaries-named-mariadb-mysql-symlinked)

Without that PR the healthcheck of mysql/maridb is not gonna be healthy on versions 11.X.

PR from https://github.com/simatec/piler-docker/pull/20

Reviewed-on: #1
2024-09-26 20:10:22 +02:00
e396da50a7 README.md aktualisiert 2024-09-26 20:06:11 +02:00
3 changed files with 4 additions and 19 deletions

View file

@ -1,15 +1,5 @@
# piler-docker # piler-docker
[![License](https://img.shields.io/github/license/simatec/piler-docker?style=flat)](https://github.com/simatec/piler-docker/blob/master/LICENSE)
[![Donate](https://img.shields.io/badge/paypal-donate%20|%20spenden-blue.svg)](https://paypal.me/mk1676)
**************************************************************************************************************
**If you like it, please consider a donation:**
[![paypal](https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif)](https://paypal.me/mk1676)
************************************************************************************************************** **************************************************************************************************************
@ -23,12 +13,6 @@ https://www.mailpiler.org/ or https://github.com/jsuto/piler
******************************************************************************************************* *******************************************************************************************************
### DockerHub
https://hub.docker.com/r/simatec/piler
*******************************************************************************************************
### Installation Guide: ### Installation Guide:
@ -66,7 +50,7 @@ reboot now
cd /opt cd /opt
``` ```
``` ```
git clone https://github.com/simatec/piler-docker.git git clone https://git.hackmi.ch/Phil/piler-docker.git
``` ```
``` ```
cd /opt/piler-docker cd /opt/piler-docker
@ -239,6 +223,7 @@ To leave the container on the console you have to execute 2x `exit`.
## License ## License
MIT License MIT License
Copyright (c) 2022 - 2024 Phil / Sniffingpaint
Copyright (c) 2022 - 2024 simatec Copyright (c) 2022 - 2024 simatec
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy

View file

@ -21,7 +21,7 @@ services:
- MARIADB_DISABLE_UPGRADE_BACKUP=1 - MARIADB_DISABLE_UPGRADE_BACKUP=1
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
healthcheck: healthcheck:
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables" test: mariadb --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
interval: "60s" interval: "60s"
timeout: "5s" timeout: "5s"
start_period: "15s" start_period: "15s"

View file

@ -49,7 +49,7 @@ services:
- MARIADB_DISABLE_UPGRADE_BACKUP=1 - MARIADB_DISABLE_UPGRADE_BACKUP=1
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
healthcheck: healthcheck:
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables" test: mariadb --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
interval: "60s" interval: "60s"
timeout: "5s" timeout: "5s"
start_period: "15s" start_period: "15s"