From 93939af97a69e625006c91b5f32aa5f0ad87c7b1 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 7 Nov 2025 13:30:29 -0500
Subject: [PATCH] Ensure `db` commands work with `env:cli`

---
 tools/local-env/scripts/docker.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/local-env/scripts/docker.js b/tools/local-env/scripts/docker.js
index e39b42a812570..c7b11f0058424 100644
--- a/tools/local-env/scripts/docker.js
+++ b/tools/local-env/scripts/docker.js
@@ -20,6 +20,11 @@ if ( [ 'exec', 'run' ].includes( dockerCommand[0] ) && ! process.stdin.isTTY ) {
 	dockerCommand.splice( 1, 0, '--no-TTY' );
 }
 
+// Add a --defaults flag to any db command WP-CLI command. See https://core.trac.wordpress.org/ticket/63876.
+if ( dockerCommand.includes( 'cli' ) && dockerCommand.includes( 'db' ) && ! dockerCommand.includes( '--defaults' ) ) {
+	dockerCommand.push( '--defaults' );
+}
+
 // Execute any Docker compose command passed to this script.
 const returns = spawnSync(
 	'docker',