Skip to content

Add custom docker-compose support for shell-command #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2020
Merged

Add custom docker-compose support for shell-command #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94ec07
Add custom docker-compose support
kirtangajjar Sep 30, 2020
40a21a4
Move docker_compose_with_custom to class EE_DOCKER
kirtangajjar Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Shell_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ public function __invoke( $args, $assoc_args ) {
$tty = get_flag_value( $assoc_args, 'skip-tty' ) ? '-T' : '';

if ( $command ) {
EE::exec( "docker-compose exec $tty $user_string $service $shell -c \"$command\"", true, true, [], true );
EE::exec( \EE_DOCKER::docker_compose_with_custom() . " exec $tty $user_string $service $shell -c \"$command\"", true, true, [], true );
} else {
$this->run( "docker-compose exec $user_string $service $shell" );
$this->run( \EE_DOCKER::docker_compose_with_custom() . " exec $user_string $service $shell" );
}
EE\Utils\delem_log( 'ee shell end' );
}
Expand Down Expand Up @@ -146,7 +146,7 @@ private function run( $cmd, $descriptors = null ) {
*/
private function check_shell_available( $shell_container, $site ) {

$launch = EE::launch( 'docker-compose config --services' );
$launch = EE::launch( \EE_DOCKER::docker_compose_with_custom() . ' config --services' );
$services = explode( PHP_EOL, trim( $launch->stdout ) );
if ( in_array( $shell_container, $services, true ) ) {
return;
Expand All @@ -165,7 +165,7 @@ private function check_shell_available( $shell_container, $site ) {
* @return bool Success.
*/
private function check_user_available( $user, $shell_container ) {
$check_command = sprintf( "docker-compose exec --user='%s' %s bash -c 'exit'", $user, $shell_container );
$check_command = sprintf( \EE_DOCKER::docker_compose_with_custom() . " exec --user='%s' %s bash -c 'exit'", $user, $shell_container );

if ( EE::exec( $check_command ) ) {
return true;
Expand Down