Fix mysqladmin and MYSQL_ROOT_PASSWORD not existing anymore on MariaD…

…B 11
phpmyadmin · Jun 29, 2023 · 87e2c6a · 87e2c6a
1 parent 87bbb8d
commit 87e2c6a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/testing/docker-compose/docker-compose.testing-config-mount-dir.yml b/testing/docker-compose/docker-compose.testing-config-mount-dir.yml
@@ -4,9 +4,9 @@ services:
   db_server:
     image: ${DB:-mariadb:10.11}
     environment:
-      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      MARIADB_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      test: ["CMD", "mariadb-admin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
       start_period: 10s
       interval: 5s
       timeout: 60s

diff --git a/testing/docker-compose/docker-compose.testing-default.yml b/testing/docker-compose/docker-compose.testing-default.yml
@@ -4,9 +4,9 @@ services:
   db_server:
     image: ${DB:-mariadb:10.11}
     environment:
-      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      MARIADB_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      test: ["CMD", "mariadb-admin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
       start_period: 10s
       interval: 5s
       timeout: 60s

diff --git a/testing/docker-compose/docker-compose.testing-different-apache-port.yml b/testing/docker-compose/docker-compose.testing-different-apache-port.yml
@@ -4,9 +4,9 @@ services:
   db_server:
     image: ${DB:-mariadb:10.11}
     environment:
-      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      MARIADB_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      test: ["CMD", "mariadb-admin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
       start_period: 10s
       interval: 5s
       timeout: 60s

diff --git a/testing/docker-compose/docker-compose.testing-fs-import-export.yml b/testing/docker-compose/docker-compose.testing-fs-import-export.yml
@@ -4,9 +4,9 @@ services:
   db_server:
     image: ${DB:-mariadb:10.11}
     environment:
-      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      MARIADB_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      test: ["CMD", "mariadb-admin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
       start_period: 10s
       interval: 5s
       timeout: 60s

diff --git a/testing/docker-compose/docker-compose.testing-one-host.yml b/testing/docker-compose/docker-compose.testing-one-host.yml
@@ -4,9 +4,9 @@ services:
   db_server:
     image: ${DB:-mariadb:10.11}
     environment:
-      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      MARIADB_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      test: ["CMD", "mariadb-admin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
       start_period: 10s
       interval: 5s
       timeout: 60s