diff --git a/.env b/.env index 7cbb06145a..63a8169f64 100644 --- a/.env +++ b/.env @@ -48,8 +48,8 @@ LOCAL_DB_TYPE=mysql # # 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. +# When using `mysql`, see https://hub.docker.com/r/amd64/mysql for valid versions. +# When using `mariadb`, see https://hub.docker.com/r/amd64/mariadb for valid versions. ## LOCAL_DB_VERSION=5.7 diff --git a/docker-compose.yml b/docker-compose.yml index c4ddb0faa1..739c65f4a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,7 +65,7 @@ services: # The MySQL container. ## mysql: - image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest} + image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest} networks: - wpdevnet diff --git a/tools/local-env/scripts/docker.js b/tools/local-env/scripts/docker.js index b8f9d2cf66..fed70aeb59 100644 --- a/tools/local-env/scripts/docker.js +++ b/tools/local-env/scripts/docker.js @@ -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' } ); diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index 223a0fa2a6..c17bbce887 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -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' ); diff --git a/tools/local-env/scripts/start.js b/tools/local-env/scripts/start.js index 94180ce4b3..83250ab9a4 100644 --- a/tools/local-env/scripts/start.js +++ b/tools/local-env/scripts/start.js @@ -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'