Changeset 59484

Timestamp:

12/04/2024 03:16:02 PM (7 months ago)

Author:

desrosj

Message:

Build/Test Tools: Support older MariaDB versions in local Docker environment.

Older versions of MariaDB did not contain the mariadb-admin command. This command is configured as the healthcheck used by the local Docker environment to confirm that the database container has successfully started and is reporting as “healthy”. The current result is a failure when starting the environment while using one of the affected older versions.

For MariaDB versions 10.3 and earlier, the mysqladmin command was used instead. Since WordPress still technically supports back to MariaDB 5.5, the local environment should support running these versions. This updates the environment configuration to take this into account when performing a healthcheck test.

The README file is also updated to reflect that the same workaround added in [57568] for MySQL <= 5.7 is required when using MariaDB 5.5 on an Apple silicon machine.

Props johnbillion.
See #62221.

Location:

trunk

Files:

• .github/workflows/reusable-phpunit-tests-v3.yml (modified) (1 diff)
• README.md (modified) (1 diff)
• docker-compose.yml (modified) (1 diff)

trunk/.github/workflows/reusable-phpunit-tests-v3.yml

@@ -172 +172 @@
       - name: WordPress Docker container debug information
         run: |
-          docker compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version
+          docker compose run --rm mysql ${{ env.LOCAL_DB_TYPE == 'mariadb' && contains( fromJSON('["5.5", "10.0", "10.1", "10.2", "10.3"]'), env.LOCAL_DB_VERSION ) && 'mysql' || env.LOCAL_DB_TYPE }} --version
           docker compose run --rm php php --version
           docker compose run --rm php php -m

trunk/README.md

@@ -140 +140 @@
 ```
 
-### Apple Silicon machines and old MySQL versions
+### Apple Silicon machines and old MySQL/MariaDB versions
 
-The MySQL Docker images do not support Apple Silicon processors (M1, M2, etc.) for MySQL versions 5.7 and earlier.
+Older MySQL and MariaDB Docker images do not support Apple Silicon processors (M1, M2, etc.). This is true for:
 
-When using MySQL <= 5.7 on an Apple Silicon machine, you must create a `docker-compose.override.yml` file with the following contents:
+- MySQL versions 5.7 and earlier
+- MariaDB 5.5
+
+When using these versions on an Apple Silicon machine, you must create a `docker-compose.override.yml` file with the following contents:
 
 ```

trunk/docker-compose.yml

@@ -83 +83 @@
 
     healthcheck:
-      test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ]
+      test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then case \"$LOCAL_DB_VERSION\" in 5.5|10.0|10.1|10.2|10.3) mysqladmin ping -h localhost || exit $?;; *) mariadb-admin ping -h localhost || exit $?;; esac; else mysqladmin ping -h localhost || exit $?; fi" ]
       timeout: 5s
       interval: 5s