From e0099f3a251fd3cbac1f41e32a464ea6137f2ee2 Mon Sep 17 00:00:00 2001 From: tschilling Date: Sat, 17 Jun 2023 09:58:30 -0500 Subject: [PATCH 1/2] Fix CI tests with MariaDB. The docker image now uses MARIADB_ROOT_PASSWORD for the environment variable for the password rather than MYSQL_ROOT_PASSWORD. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc4b9a456..fc0937485 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: mariadb: image: mariadb env: - MYSQL_ROOT_PASSWORD: debug_toolbar + MARIADB_ROOT_PASSWORD: debug_toolbar options: >- --health-cmd "mysqladmin ping" --health-interval 10s From 19a866480b07514bf696d72ff5668092274fc624 Mon Sep 17 00:00:00 2001 From: tschilling Date: Sat, 17 Jun 2023 10:05:57 -0500 Subject: [PATCH 2/2] It's mariadb-admin now not mysqladmin As per https://github.com/MariaDB/mariadb-docker/issues/497 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc0937485..9dece68ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: env: MARIADB_ROOT_PASSWORD: debug_toolbar options: >- - --health-cmd "mysqladmin ping" + --health-cmd "mariadb-admin ping" --health-interval 10s --health-timeout 5s --health-retries 5