Changeset 49836

Timestamp:

12/18/2020 03:27:33 PM (4 years ago)

Author:

desrosj

Message:

Build/Test Tools: Support the use of MariaDB in the local Docker environment.

In addition to MySQL, WordPress also supports MariaDB for databases. This makes changes to the local Docker environment to allow MariaDB to be used instead, if desired.

The LOCAL_DB_TYPE environment variable will now be used to determine which type of database container to use. This will default to mysql, but will also accept mariadb.

The LOCAL_MYSQL environment variable (which previously held the version of MySQL to use) has been replaced with the new, more generic LOCAL_DB_VERSION environment variable.

This change will make it possible to perform automated testing on a wider array of supported database types and versions.

Props davidbaumwald.
Fixes #51744. See #30462.

Location:

trunk

Files:

• .env (modified) (1 diff)
• docker-compose.yml (modified) (1 diff)

trunk/.env

@@ -46 +46 @@
 LOCAL_PHP_MEMCACHED=false
 
-# The MySQL version to use. See https://hub.docker.com/_/mysql/ for valid versions.
-LOCAL_MYSQL=5.7
+# The database software to use.
+#
+# Supported values are `mysql` and `mariadb`.
+LOCAL_DB_TYPE=mysql
+
+# The database version to use.
+#
+# Defaults to 5.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
+#
+# When using `mysql`, see https://hub.docker.com/_/mysql/ for valid versions.
+# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
+LOCAL_DB_VERSION=5.7
 
 # The debug settings to add to `wp-config.php`.

trunk/docker-compose.yml

@@ -54 +54 @@
   ##
   mysql:
-    image: mysql:${LOCAL_MYSQL-latest}
+    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
 
     networks: