<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[60308] trunk: Build/Test Tools: Improve dev environment's CLI in speed, non-interactive usage, and argument handling.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60308">60308</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60308","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-06-13 23:01:18 +0000 (Fri, 13 Jun 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Improve dev environment's CLI in speed, non-interactive usage, and argument handling.
* Start `cli` container when running `env:start`. This greatly speeds up calls to WP-CLI since the container is already running rather than having to start up for each call.
* Facilitate calls to `env:cli` in non-interactive context (non-TTY) to allow piping content into commands or use in shell scripts.
* Fix passing arguments to WP-CLI from `env:cli` so that arguments with spaces are passed as expected.
* Fix JSHint issues.
This aligns the wordpress-develop environment closer to wp-env. See https://github.com/WordPress/gutenberg/pull/50007.
Props westonruter, jorbin, SirLouen, sandeepdahiya.
Fixes <a href="https://core.trac.wordpress.org/ticket/63564">#63564</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgithubworkflowsreusabletestlocaldockerenvironmentv1yml">trunk/.github/workflows/reusable-test-local-docker-environment-v1.yml</a></li>
<li><a href="#trunkdockercomposeyml">trunk/docker-compose.yml</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
<li><a href="#trunktoolslocalenvscriptsdockerjs">trunk/tools/local-env/scripts/docker.js</a></li>
<li><a href="#trunktoolslocalenvscriptsinstalljs">trunk/tools/local-env/scripts/install.js</a></li>
<li><a href="#trunktoolslocalenvscriptsstartjs">trunk/tools/local-env/scripts/start.js</a></li>
<li><a href="#trunktoolslocalenvscriptsutilsjs">trunk/tools/local-env/scripts/utils.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgithubworkflowsreusabletestlocaldockerenvironmentv1yml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/reusable-test-local-docker-environment-v1.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/reusable-test-local-docker-environment-v1.yml 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/.github/workflows/reusable-test-local-docker-environment-v1.yml 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run env:restart
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Test a CLI command
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npm run env:cli wp option get siteurl
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: npm run env:cli option get siteurl
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Test logs command
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run env:logs
</span></span></pre></div>
<a id="trunkdockercomposeyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/docker-compose.yml 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/docker-compose.yml 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,6 +111,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> volumes:
</span><span class="cx" style="display: block; padding: 0 10px"> - ./:/var/www
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Keeps the service alive.
+ command: 'sleep infinity'
+
</ins><span class="cx" style="display: block; padding: 0 10px"> # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
</span><span class="cx" style="display: block; padding: 0 10px"> init: true
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkpackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package.json 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/package.json 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
</span><span class="cx" style="display: block; padding: 0 10px"> "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
</span><span class="cx" style="display: block; padding: 0 10px"> "env:install": "node ./tools/local-env/scripts/install.js",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "env:cli": "node ./tools/local-env/scripts/docker.js run --rm cli",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "env:cli": "node ./tools/local-env/scripts/docker.js exec cli wp --allow-root",
</ins><span class="cx" style="display: block; padding: 0 10px"> "env:logs": "node ./tools/local-env/scripts/docker.js logs",
</span><span class="cx" style="display: block; padding: 0 10px"> "env:pull": "node ./tools/local-env/scripts/docker.js pull",
</span><span class="cx" style="display: block; padding: 0 10px"> "test:performance": "wp-scripts test-playwright --config tests/performance/playwright.config.js",
</span></span></pre></div>
<a id="trunktoolslocalenvscriptsdockerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/local-env/scripts/docker.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/local-env/scripts/docker.js 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/tools/local-env/scripts/docker.js 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,8 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const dotenv = require( 'dotenv' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* jshint node:true */
+
+const dotenv = require( 'dotenv' );
</ins><span class="cx" style="display: block; padding: 0 10px"> const dotenvExpand = require( 'dotenv-expand' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { execSync } = require( 'child_process' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { spawnSync } = require( 'child_process' );
</ins><span class="cx" style="display: block; padding: 0 10px"> const local_env_utils = require( './utils' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> dotenvExpand.expand( dotenv.config() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,15 +9,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const composeFiles = local_env_utils.get_compose_files();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if (process.argv.includes('--coverage-html')) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( process.argv.includes( '--coverage-html' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> process.env.LOCAL_PHP_XDEBUG = 'true';
</span><span class="cx" style="display: block; padding: 0 10px"> process.env.LOCAL_PHP_XDEBUG_MODE = 'coverage';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// This try-catch prevents the superfluous Node.js debugging information from being shown if the command fails.
-try {
- // Execute any Docker compose command passed to this script.
- execSync( 'docker compose ' + composeFiles + ' ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
-} catch ( error ) {
- process.exit( 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Add --no-TTY (-T) arg after exec and run commands when STDIN is not a TTY.
+const dockerCommand = process.argv.slice( 2 );
+if ( [ 'exec', 'run' ].includes( dockerCommand[0] ) && ! process.stdin.isTTY ) {
+ dockerCommand.splice( 1, 0, '--no-TTY' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+// Execute any Docker compose command passed to this script.
+const returns = spawnSync(
+ 'docker',
+ [
+ 'compose',
+ ...composeFiles
+ .map( ( composeFile ) => [ '-f', composeFile ] )
+ .flat(),
+ ...dockerCommand,
+ ],
+ { stdio: 'inherit' }
+);
+
+process.exit( returns.status );
</ins></span></pre></div>
<a id="trunktoolslocalenvscriptsinstalljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/local-env/scripts/install.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/local-env/scripts/install.js 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/tools/local-env/scripts/install.js 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,8 +13,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> local_env_utils.determine_auth_option();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create wp-config.php.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-wp_cli( `config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --force --config-file=${process.env.LOCAL_DIR}/../wp-config.php` );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_cli( `config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --force --config-file="wp-config.php"` );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Since WP-CLI runs as root, the wp-config.php created above will be read-only. This needs to be writable for the sake of E2E tests.
+execSync( 'node ./tools/local-env/scripts/docker.js exec cli chmod 666 wp-config.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the debug settings to wp-config.php.
</span><span class="cx" style="display: block; padding: 0 10px"> // Windows requires this to be done as an additional step, rather than using the --extra-php option in the previous step.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cli( `config set WP_DEBUG ${process.env.LOCAL_WP_DEBUG} --raw --type=constant` );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +64,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {string} cmd The WP-CLI command to run.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_cli( cmd ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const composeFiles = local_env_utils.get_compose_files();
-
- execSync( `docker compose ${composeFiles} run --quiet-pull --rm cli ${cmd} --path=/var/www/${process.env.LOCAL_DIR}`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ execSync( `npm --silent run env:cli -- ${cmd} --path=/var/www/${process.env.LOCAL_DIR}`, { stdio: 'inherit' } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktoolslocalenvscriptsstartjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/local-env/scripts/start.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/local-env/scripts/start.js 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/tools/local-env/scripts/start.js 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,13 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* jshint node:true */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> const dotenv = require( 'dotenv' );
</span><span class="cx" style="display: block; padding: 0 10px"> const dotenvExpand = require( 'dotenv-expand' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { execSync } = require( 'child_process' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { execSync, spawnSync } = require( 'child_process' );
</ins><span class="cx" style="display: block; padding: 0 10px"> const local_env_utils = require( './utils' );
</span><span class="cx" style="display: block; padding: 0 10px"> const { constants, copyFile } = require( 'node:fs' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy the default .env file when one is not present.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-copyFile( '.env.example', '.env', constants.COPYFILE_EXCL, (e) => {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+copyFile( '.env.example', '.env', constants.COPYFILE_EXCL, () => {
</ins><span class="cx" style="display: block; padding: 0 10px"> console.log( '.env file already exists. .env.example was not copied.' );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,18 +30,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Start the local-env containers.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
- ? 'wordpress-develop memcached'
- : 'wordpress-develop';
-execSync( `docker compose ${composeFiles} up --quiet-pull -d ${containers}`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const containers = [ 'wordpress-develop', 'cli' ];
+if ( process.env.LOCAL_PHP_MEMCACHED === 'true' ) {
+ containers.push( 'memcached' );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+spawnSync(
+ 'docker',
+ [
+ 'compose',
+ ...composeFiles.map( ( composeFile ) => [ '-f', composeFile ] ).flat(),
+ 'up',
+ '--quiet-pull',
+ '-d',
+ ...containers,
+ ],
+ { stdio: 'inherit' }
+);
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If Docker Toolbox is being used, we need to manually forward LOCAL_PORT to the Docker VM.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( process.env.DOCKER_TOOLBOX_INSTALL_PATH ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // VBoxManage is added to the PATH on every platform except Windows.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const vboxmanage = process.env.VBOX_MSI_INSTALL_PATH ? `${ process.env.VBOX_MSI_INSTALL_PATH }/VBoxManage` : 'VBoxManage'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const vboxmanage = process.env.VBOX_MSI_INSTALL_PATH ? `${ process.env.VBOX_MSI_INSTALL_PATH }/VBoxManage` : 'VBoxManage';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the port forwarding is already configured for this port.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const vminfoBuffer = execSync( `"${ vboxmanage }" showvminfo "${ process.env.DOCKER_MACHINE_NAME }" --machinereadable` );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const vminfoBuffer = spawnSync(
+ vboxmanage,
+ [
+ 'showvminfo',
+ process.env.DOCKER_MACHINE_NAME,
+ '--machinereadable'
+ ]
+ ).stdout;
</ins><span class="cx" style="display: block; padding: 0 10px"> const vminfo = vminfoBuffer.toString().split( /[\r\n]+/ );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> vminfo.forEach( ( info ) => {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,10 +75,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete rules that are using the port we need.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( rule[ 3 ] === process.env.LOCAL_PORT || rule[ 5 ] === process.env.LOCAL_PORT ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- execSync( `"${ vboxmanage }" controlvm "${ process.env.DOCKER_MACHINE_NAME }" natpf1 delete ${ rule[ 0 ] }`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ spawnSync(
+ vboxmanage,
+ [
+ 'controlvm',
+ process.env.DOCKER_MACHINE_NAME,
+ 'natpf1',
+ 'delete',
+ rule[ 0 ]
+ ],
+ { stdio: 'inherit' }
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add our port forwarding rule.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- execSync( `"${ vboxmanage }" controlvm "${ process.env.DOCKER_MACHINE_NAME }" natpf1 "tcp-port${ process.env.LOCAL_PORT },tcp,127.0.0.1,${ process.env.LOCAL_PORT },,${ process.env.LOCAL_PORT }"`, { stdio: 'inherit' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ spawnSync(
+ vboxmanage,
+ [
+ 'controlvm',
+ process.env.DOCKER_MACHINE_NAME,
+ 'natpf1',
+ `tcp-port${ process.env.LOCAL_PORT },tcp,127.0.0.1,${ process.env.LOCAL_PORT },,${ process.env.LOCAL_PORT }`
+ ],
+ { stdio: 'inherit' }
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktoolslocalenvscriptsutilsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/local-env/scripts/utils.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/local-env/scripts/utils.js 2025-06-13 18:21:56 UTC (rev 60307)
+++ trunk/tools/local-env/scripts/utils.js 2025-06-13 23:01:18 UTC (rev 60308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* jshint node:true */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> const { existsSync } = require( 'node:fs' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const local_env_utils = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,12 +12,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * When PHP 7.2 or 7.3 is used in combination with MySQL 8.4, an override file will also be returned to ensure
</span><span class="cx" style="display: block; padding: 0 10px"> * that the mysql_native_password plugin authentication plugin is on and available for use.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return {string[]} Compose files.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> get_compose_files: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var composeFiles = '-f docker-compose.yml';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const composeFiles = [ 'docker-compose.yml' ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( existsSync( 'docker-compose.override.yml' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- composeFiles = composeFiles + ' -f docker-compose.override.yml';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ composeFiles.push( 'docker-compose.override.yml' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( process.env.LOCAL_DB_TYPE !== 'mysql' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // PHP 7.2/7.3 in combination with MySQL 8.4 requires additional configuration to function properly.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( process.env.LOCAL_DB_VERSION === '8.4' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- composeFiles = composeFiles + ' -f tools/local-env/old-php-mysql-84.override.yml';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ composeFiles.push( 'tools/local-env/old-php-mysql-84.override.yml' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return composeFiles;
</span></span></pre>
</div>
</div>
</body>
</html>