Skip to content

Commit d3b6cee

Browse files
authored
Merge pull request #6040 from drzraf/optional-docker-exec
2 parents 43f1d7b + 0882b70 commit d3b6cee

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

php/WP_CLI/Runner.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,10 +601,12 @@ private function generate_ssh_command( $bits, $wp_command ) {
601601
$is_stdout_tty = function_exists( 'posix_isatty' ) && posix_isatty( STDOUT );
602602
$is_stdin_tty = function_exists( 'posix_isatty' ) ? posix_isatty( STDIN ) : true;
603603

604-
$docker_compose_v2_version_cmd = Utils\esc_cmd( Utils\force_env_on_nix_systems( 'docker' ) . ' compose %s', 'version' );
605-
$docker_compose_cmd = ! empty( Process::create( $docker_compose_v2_version_cmd )->run()->stdout )
606-
? 'docker compose'
607-
: 'docker-compose';
604+
if ( in_array( $bits['scheme'], [ 'docker', 'docker-compose', 'docker-compose-run' ], true ) ) {
605+
$docker_compose_v2_version_cmd = Utils\esc_cmd( Utils\force_env_on_nix_systems( 'docker' ) . ' compose %s', 'version' );
606+
$docker_compose_cmd = ! empty( Process::create( $docker_compose_v2_version_cmd )->run()->stdout )
607+
? 'docker compose'
608+
: 'docker-compose';
609+
}
608610

609611
if ( 'docker' === $bits['scheme'] ) {
610612
$command = 'docker exec %s%s%s%s%s sh -c %s';

0 commit comments

Comments
 (0)