From 9b04b4ce731c32a72f28a47dbc9d57643c7490b0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 31 Aug 2018 11:39:50 -0700 Subject: [PATCH] Add "mysqladmin" as a less-invasive healthcheck for MySQL (when it's available) --- mysql/docker-healthcheck | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mysql/docker-healthcheck b/mysql/docker-healthcheck index 83b053c..eefb613 100755 --- a/mysql/docker-healthcheck +++ b/mysql/docker-healthcheck @@ -18,8 +18,14 @@ args=( --silent ) -if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then - exit 0 +if command -v mysqladmin &> /dev/null; then + if mysqladmin "${args[@]}" ping > /dev/null; then + exit 0 + fi +else + if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then + exit 0 + fi fi exit 1