If we don't intend to connect through docker, don't even exec() it in the first place. Less syscalls and more apparmor-friendly behavior

Raphaël Droz · Raphaël Droz · commit dec7b4d47b54 · 2025-01-30T12:51:11.000-03:00
diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
@@ -567,11 +567,13 @@ private function generate_ssh_command( $bits, $wp_command ) {
 			WP_CLI::debug( 'SSH ' . $bit . ': ' . $bits[ $bit ], 'bootstrap' );
 		}
 
-		$is_tty                        = function_exists( 'posix_isatty' ) && posix_isatty( STDOUT );
-		$docker_compose_v2_version_cmd = Utils\esc_cmd( Utils\force_env_on_nix_systems( 'docker' ) . ' compose %s', 'version' );
-		$docker_compose_cmd            = ! empty( Process::create( $docker_compose_v2_version_cmd )->run()->stdout )
-			? 'docker compose'
-			: 'docker-compose';
+		$is_tty = function_exists( 'posix_isatty' ) && posix_isatty( STDOUT );
+		if ( in_array( $bits['scheme'], [ 'docker', 'docker-compose', 'docker-compose-run' ], true ) ) {
+			$docker_compose_v2_version_cmd = Utils\esc_cmd( Utils\force_env_on_nix_systems( 'docker' ) . ' compose %s', 'version' );
+			$docker_compose_cmd            = ! empty( Process::create( $docker_compose_v2_version_cmd )->run()->stdout )
+				? 'docker compose'
+				: 'docker-compose';
+		}
 
 		if ( 'docker' === $bits['scheme'] ) {
 			$command = 'docker exec %s%s%s sh -c %s';
