Merge pull request #5936 from thelovekesh/patch-1

schlessera · web-flow · commit d1f69d8890fb · 2024-04-26T12:12:03.000+02:00
Update docker runner to resolve docker path using `/usr/bin/env`
diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
@@ -569,10 +569,11 @@ 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_cmd = ! empty( Process::create( Utils\esc_cmd( 'docker compose %s', 'version' ) )->run()->stdout )
-								? 'docker compose'
-								: 'docker-compose';
+		$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';
 
 		if ( 'docker' === $bits['scheme'] ) {
 			$command = 'docker exec %s%s%s sh -c %s';
