Changeset 53359

Timestamp:

05/06/2022 05:25:34 PM (3 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Allow the local development environment to run on Apple M1 machines without requiring local configuration changes.

The amd64/mysql and amd64/mariadb official images from Docker are compatible with x86 running on the ARM64v8 architecture of M1 machines.

Merges [53358] to the 6.0 branch.

Fixes #52356

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• tools/local-env/scripts/docker.js (modified) (1 diff)
• tools/local-env/scripts/install.js (modified) (1 diff)
• tools/local-env/scripts/start.js (modified) (1 diff)

branches/6.0/tools/local-env/scripts/docker.js

@@ -5 +5 @@
 dotenvExpand.expand( dotenv.config() );
 
+if ( process.arch === 'arm64' ) {
+    process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
+}
+
 // Execute any docker-compose command passed to this script.
 execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );

branches/6.0/tools/local-env/scripts/install.js

@@ -6 +6 @@
 
 dotenvExpand.expand( dotenv.config() );
+
+if ( process.arch === 'arm64' ) {
+    process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
+}
 
 // Create wp-config.php.

branches/6.0/tools/local-env/scripts/start.js

@@ -4 +4 @@
 
 dotenvExpand.expand( dotenv.config() );
+
+if ( process.arch === 'arm64' ) {
+    process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
+}
 
 // Start the local-env containers.