From adc99411d0907fca0666bbafaf073e0e67e8a839 Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Sat, 25 May 2024 14:36:57 +0200
Subject: [PATCH] Add parameters to database availability pings, show waiting
 message

---
 .../image/console/root/usr/lib/task/database/available.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/image/console/root/usr/lib/task/database/available.sh b/docker/image/console/root/usr/lib/task/database/available.sh
index 0700aff..9013121 100644
--- a/docker/image/console/root/usr/lib/task/database/available.sh
+++ b/docker/image/console/root/usr/lib/task/database/available.sh
@@ -5,9 +5,9 @@ function task_database_available()
     local command=""
 
     if [ "${DB_PLATFORM}" == "mysql" ]; then
-        command="mysqladmin -h $DB_HOST -u ${DB_ADMIN_USER:-$DB_USER} -p${DB_ROOT_PASS:-${DB_ADMIN_PASS:-$DB_PASS}} ping --connect_timeout=10"
+        command="mysqladmin -h $DB_HOST -u ${DB_ADMIN_USER:-$DB_USER} -p${DB_ROOT_PASS:-${DB_ADMIN_PASS:-$DB_PASS}} -P ${DB_PORT} ping --connect_timeout=10"
     elif [ "${DB_PLATFORM}" == "postgres" ]; then
-        command="pg_isready -h $DB_HOST"
+        command="pg_isready -h $DB_HOST -U ${DB_ADMIN_USER:-$DB_USER} -p ${DB_PORT}"
     elif [ "${DB_PLATFORM}" == "" ]; then
         # no database is used
         return
@@ -25,6 +25,10 @@ function task_database_available()
             exit 1
         fi
 
+        if ! (( counter % 5 )); then
+          echo "Waiting for database to become available: '${command}'"
+        fi
+
         sleep 2
         ((++counter))
     done