Changeset 59277

Timestamp:

10/22/2024 11:41:29 PM (5 months ago)

Author:

desrosj

Message:

Build/Test Tools: Add support for MySQL 8.4 to the Docker environment.

See #62221.

Location:

trunk

Files:

• docker-compose.yml (modified) (1 diff)
• tools/local-env/mysql-old-php.conf (added)
• tools/local-env/old-php-mysql-84.override.yml (added)
• tools/local-env/scripts/docker.js (modified) (1 diff)
• tools/local-env/scripts/install.js (modified) (3 diffs)
• tools/local-env/scripts/start.js (modified) (3 diffs)
• tools/local-env/scripts/utils.js (added)

trunk/docker-compose.yml

@@ -80 +80 @@
 
     # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0.
-    command: --default-authentication-plugin=mysql_native_password
+    command: ${LOCAL_DB_AUTH_OPTION-}
 
     healthcheck:

trunk/tools/local-env/scripts/docker.js

@@ -2 +2 @@
 const dotenvExpand = require( 'dotenv-expand' );
 const { execSync } = require( 'child_process' );
+const local_env_utils = require( './utils' );
 
 dotenvExpand.expand( dotenv.config() );
 
+const composeFiles = local_env_utils.get_compose_files();
+
 // Execute any docker compose command passed to this script.
-execSync( 'docker compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
+execSync( 'docker compose ' + composeFiles + ' ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );

trunk/tools/local-env/scripts/install.js

@@ -4 +4 @@
 const { execSync } = require( 'child_process' );
 const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
+const { utils } = require( './utils.js' );
+const local_env_utils = require( './utils' );
 
 dotenvExpand.expand( dotenv.config() );
+
+// Determine if a non-default database authentication plugin needs to be used.
+local_env_utils.determine_auth_option();
 
 // Create wp-config.php.
@@ -49 +54 @@
  */
 function wp_cli( cmd ) {
-    execSync( `docker compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
+    const composeFiles = local_env_utils.get_compose_files();
+
+    execSync( `docker compose ${composeFiles} run --rm cli ${cmd}`, { stdio: 'inherit' } );
 }
 
@@ -57 +64 @@
 function install_wp_importer() {
     const testPluginDirectory = 'tests/phpunit/data/plugins/wordpress-importer';
+    const composeFiles = local_env_utils.get_compose_files();
 
-    execSync( `docker compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
-    execSync( `docker compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
+    execSync( `docker compose ${composeFiles} exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
+    execSync( `docker compose ${composeFiles} exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
 }

trunk/tools/local-env/scripts/start.js

@@ -2 +2 @@
 const dotenvExpand = require( 'dotenv-expand' );
 const { execSync } = require( 'child_process' );
+const local_env_utils = require( './utils' );
 const { constants, copyFile } = require( 'node:fs' );
 
@@ -10 +11 @@
 
 dotenvExpand.expand( dotenv.config() );
+
+const composeFiles = local_env_utils.get_compose_files();
+
+// Determine if a non-default database authentication plugin needs to be used.
+local_env_utils.determine_auth_option();
 
 // Check if the Docker service is running.
@@ -26 +32 @@
     ? 'wordpress-develop memcached'
     : 'wordpress-develop';
-execSync( `docker compose up -d ${containers}`, { stdio: 'inherit' } );
+execSync( `docker compose ${composeFiles} up -d ${containers}`, { stdio: 'inherit' } );
 
 // If Docker Toolbox is being used, we need to manually forward LOCAL_PORT to the Docker VM.