Add "mysqladmin" as a less-invasive healthcheck for MySQL (when it's available)

2018-08-31 11:39:50 -07:00 · 2018-08-31 11:39:50 -07:00 · 9b04b4ce73
parent 8a4471517d
commit 9b04b4ce73
1 changed files with 8 additions and 2 deletions
--- a/mysql/docker-healthcheck
+++ b/mysql/docker-healthcheck
@ -18,8 +18,14 @@ args=(
 	--silent
 )

-if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+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