Changeset 54096

Timestamp:

09/07/2022 05:13:43 PM (2 years ago)

Author:

johnbillion

Message:

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

Location:

trunk

Files:

• .env (modified) (1 diff)
• docker-compose.yml (modified) (1 diff)
• 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)

trunk/.env

@@ -49 +49 @@
 # 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

trunk/docker-compose.yml

@@ -66 +66 @@
   ##
   mysql:
-    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
+    image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
 
     networks:

trunk/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' } );

trunk/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.

trunk/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.