Make WordPress Core

Changeset 54096


Ignore:
Timestamp:
09/07/2022 05:13:43 PM (21 months 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/.env

    r53552 r54096  
    4949# Defaults to 5.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
    5050#
    51 # When using `mysql`, see https://hub.docker.com/_/mysql/ for valid versions.
    52 # When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
     51# When using `mysql`, see https://hub.docker.com/r/amd64/mysql for valid versions.
     52# When using `mariadb`, see https://hub.docker.com/r/amd64/mariadb for valid versions.
    5353##
    5454LOCAL_DB_VERSION=5.7
  • trunk/docker-compose.yml

    r53895 r54096  
    6666  ##
    6767  mysql:
    68     image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
     68    image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
    6969
    7070    networks:
  • trunk/tools/local-env/scripts/docker.js

    r53358 r54096  
    55dotenvExpand.expand( dotenv.config() );
    66
    7 if ( process.arch === 'arm64' ) {
    8     process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
    9 }
    10 
    117// Execute any docker-compose command passed to this script.
    128execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
  • trunk/tools/local-env/scripts/install.js

    r53358 r54096  
    66
    77dotenvExpand.expand( dotenv.config() );
    8 
    9 if ( process.arch === 'arm64' ) {
    10     process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
    11 }
    128
    139// Create wp-config.php.
  • trunk/tools/local-env/scripts/start.js

    r53895 r54096  
    44
    55dotenvExpand.expand( dotenv.config() );
    6 
    7 if ( process.arch === 'arm64' ) {
    8     process.env.LOCAL_DB_TYPE = `amd64/${process.env.LOCAL_DB_TYPE}`;
    9 }
    106
    117// Start the local-env containers.
Note: See TracChangeset for help on using the changeset viewer.