From 34e7e3ce4ff8862acc3dd605fd92478e5241273e Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 23 Nov 2018 20:31:49 +0530 Subject: [PATCH 1/4] Check prepare.sh Signed-off-by: Riddhesh Sanghvi --- ci/prepare.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/prepare.sh b/ci/prepare.sh index 5f2a38056..a3fd49a41 100755 --- a/ci/prepare.sh +++ b/ci/prepare.sh @@ -13,4 +13,5 @@ fi php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quiet # Checking the phar is working. -./easyengine.phar cli info \ No newline at end of file +sudo ./easyengine.phar cli info +docker ps -a \ No newline at end of file From 2276fe78aaad17fbfd5ea685191591853cbacdee Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 23 Nov 2018 20:44:10 +0530 Subject: [PATCH 2/4] Update checks and messages for macOS Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 99a2549b8..fa0133b3a 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -81,28 +81,33 @@ private function init_ee() { */ public function check_requirements( $show_error = true ) { - $status = true; - $error = []; + $docker_running = true; + $status = true; + $error = []; - $docker_running = 'docker ps > /dev/null'; - if ( ! EE::exec( $docker_running ) ) { - $status = false; - $error[] = 'Docker not installed or not running.'; + $docker_running_cmd = 'docker ps > /dev/null'; + if ( ! EE::exec( $docker_running_cmd ) ) { + $status = false; + $docker_running = false; + $error[] = 'Docker not installed or not running.'; } $docker_compose_installed = 'command -v docker-compose > /dev/null'; if ( ! EE::exec( $docker_compose_installed ) ) { - $status = false; - $error[] = 'EasyEngine requires docker-compose.'; + $status = false; + $error[] = 'EasyEngine requires docker-compose.'; } if ( version_compare( PHP_VERSION, '7.2.0' ) < 0 ) { - $status = false; - $error[] = 'EasyEngine requires minimum PHP 7.2.0 to run.'; + $status = false; + $error[] = 'EasyEngine requires minimum PHP 7.2.0 to run.'; } if ( $show_error && ! $status ) { - EE::error( reset( $error ) ); + EE::error( reset( $error ), false ); + if ( IS_DARWIN && ! $docker_running ) { + EE::log( 'For macOS docker can be installed using: `brew cask install docker`' ); + } } return $status; From 94a1fd381516c60ec7258348bbfa985bdb0164dc Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 23 Nov 2018 20:48:59 +0530 Subject: [PATCH 3/4] Exit after showing error. Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index fa0133b3a..3a83acfea 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -108,6 +108,7 @@ public function check_requirements( $show_error = true ) { if ( IS_DARWIN && ! $docker_running ) { EE::log( 'For macOS docker can be installed using: `brew cask install docker`' ); } + die; } return $status; From 9fa620ca1e21381ea2b1f3ec4abc7e5c74b15072 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 23 Nov 2018 20:54:05 +0530 Subject: [PATCH 4/4] Update self-uninstall Signed-off-by: Riddhesh Sanghvi --- php/commands/src/CLI_Command.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/php/commands/src/CLI_Command.php b/php/commands/src/CLI_Command.php index a80198165..6ab58af42 100644 --- a/php/commands/src/CLI_Command.php +++ b/php/commands/src/CLI_Command.php @@ -502,18 +502,19 @@ public function self_uninstall( $args, $assoc_args ) { EE::confirm( "Are you sure you want to remove EasyEngine and all its sites(along with their data)?\nThis is an irreversible action. No backup will be kept.", $assoc_args ); EE::exec( 'docker rm -f $(docker ps -aqf label=org.label-schema.vendor="EasyEngine")' ); - $home = Utils\get_home_dir(); - EE::exec( "rm -rf $home/.ee/" ); + EE::exec( 'docker network prune -f $(docker network ls -f "label=org.label-schema.vendor=EasyEngine")' ); + EE::exec( 'docker volume rm -f $(docker volume ls -f "label=org.label-schema.vendor=EasyEngine" -q)' ); + EE::exec( 'docker image rm $(docker image ls -f "label=org.label-schema.vendor=EasyEngine" -q)' ); $records = Site::all( [ 'site_fs_path' ] ); + $fs = new Filesystem(); if ( ! empty( $records ) ) { $sites_paths = array_column( $records, 'site_fs_path' ); - $fs = new Filesystem(); $fs->remove( $sites_paths ); } - EE::exec( "rm -rf " . EE_ROOT_DIR ); + $fs->remove( EE_ROOT_DIR ); if ( Utils\inside_phar() ) { unlink( realpath( $_SERVER['argv'][0] ) );