mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-12 04:40:26 +00:00
Build/Test Tools: Always use the amd64 images for MariaDB and MySQL on the local development environment.
The `amd64/mysql` and `amd64/mariadb` official images from Docker are also compatible with an x64 host machine which means they can be used by default instead of only when the host uses ARM64. Props bernhard-reiter, czapla, gmovr, withinboredom Fixes #56528 git-svn-id: https://develop.svn.wordpress.org/trunk@54096 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -4,9 +4,5 @@ const { execSync } = require( 'child_process' );
|
||||
|
||||
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' } );
|
||||
|
||||
@@ -6,10 +6,6 @@ const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
|
||||
|
||||
dotenvExpand.expand( dotenv.config() );
|
||||
|
||||
if ( process.arch === 'arm64' ) {
|
||||
process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
|
||||
}
|
||||
|
||||
// Create wp-config.php.
|
||||
wp_cli( 'config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --path=/var/www/src --force' );
|
||||
|
||||
|
||||
@@ -4,10 +4,6 @@ const { execSync } = require( 'child_process' );
|
||||
|
||||
dotenvExpand.expand( dotenv.config() );
|
||||
|
||||
if ( process.arch === 'arm64' ) {
|
||||
process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
|
||||
}
|
||||
|
||||
// Start the local-env containers.
|
||||
const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
|
||||
? 'wordpress-develop memcached'
|
||||
|
||||
Reference in New Issue
Block a user