Release 7.2.19 - See CHANGELOG.md

tiredofit · Jan 20, 2022 · 25e9479 · 25e9479
1 parent 0089462
commit 25e9479
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.2.19 2022-01-20 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Rework again db_ready command for MySQL / MariaDB
+
+
 ## 7.2.18 2022-01-06 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/alpine:3.15
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-ARG GOLANG_VERSION=1.17.5
+ARG GOLANG_VERSION=1.17.6
 ARG ZABBIX_VERSION
 ARG FLUENTBIT_VERSION
 ARG S6_OVERLAY_VERSION

diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container
@@ -254,10 +254,10 @@ db_ready() {
             if [ -n "${MYSQL_NAME}" ] ; then maria_name=${MYSQL_NAME} ; fi ;
             if [ -n "${MARIA_NAME}" ] ; then maria_name=${MARIA_NAME} ; fi ;
             counter=0
-            while ! (mysql -u"${maria_user}" -P"${maria_port}" -h"${maria_host}" -p"${maria_pass}" -e "SHOW GRANTS FOR CURRENT_USER;" 2>&1 | grep -E "GRANT ALL PRIVILEGES ON \`${DB_NAME}\`" > /dev/null 2>&1) ; do
+            while ! (mysqladmin -u"${maria_user}" -P"${maria_port}" -h"${maria_host}" -p"${maria_pass}" status > /dev/null 2>&1) ; do
               sleep 5
               (( counter+=5 ))
-              print_warn "MySQL/MariaDB Server '${maria_host}' is not accessible, retrying.. ($counter seconds so far)"
+              print_warn "MySQL/MariaDB Server '${maria_host}' is not accessible, retrying.. (${counter} seconds so far)"
             done
         ;;
         "pgsql" | "psql" | "postgres" | "postgresql" )