Merge branch 'staging' into nightly

2024-08-19 11:42:12 +02:00
parent fa3c453d6e b70bcd36fb
commit e21157c10d
14 changed files with 27 additions and 23 deletions
@@ -2,7 +2,7 @@
 set -e

 # Wait for MySQL to warm-up
-while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
+while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
  echo "Waiting for database to come up..."
  sleep 2
 done