From 08f7aab75a36a9ec463e8b137c7ac5c0c5c2fca9 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 26 Jan 2025 12:40:12 +0100 Subject: [PATCH] fix(phpunit-mariadb): Use correct script name and env variable In MariaDB 11 there was a "breaking" change in the docker files that removed the legacy `mysqladm` and replaced it with `mariadb-admin`. The symlink is not provided in the docker image so we need to use the correct name here to make 10.6 AND 11.4 work. Also the `MYSQL_` env variables are deprecated and will be removed. Signed-off-by: Ferdinand Thiessen --- workflow-templates/phpunit-mariadb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow-templates/phpunit-mariadb.yml b/workflow-templates/phpunit-mariadb.yml index 37ae1e31..c16e7790 100644 --- a/workflow-templates/phpunit-mariadb.yml +++ b/workflow-templates/phpunit-mariadb.yml @@ -80,8 +80,8 @@ jobs: ports: - 4444:3306/tcp env: - MYSQL_ROOT_PASSWORD: rootpassword - options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5 + MARIADB_ROOT_PASSWORD: rootpassword + options: --health-cmd="mariadb-admin ping" --health-interval 5s --health-timeout 2s --health-retries 5 steps: - name: Set app env