Merge branch 'mrrobot47-fix/checks' into develop-v4

Author: mbtamuli

php/EE/Migration/GlobalContainers.php

@@ -41,7 +41,7 @@ public static function revert_global_containers( $source_path, $dest_path, $upda
 
 		$services_to_regenerate = '';
 		$all_global_images      = self::get_all_global_images_with_service_name();
-		foreach ( $updated_global_images as $image_name ) {
+		foreach ( $updated_images as $image_name ) {
 			$global_container_name  = $all_global_images[ $image_name ];
 			$services_to_regenerate .= str_replace( '-', '_', ltrim( $global_container_name, 'ee-' ) ) . ' ';
 		}

php/EE/Runner.php

@@ -51,21 +51,6 @@ public function __get( $key ) {
 	 */
 	private function init_ee() {
 
-		// Minimum requirement checks.
-		$docker_running = 'docker ps > /dev/null';
-		if ( ! EE::exec( $docker_running ) ) {
-			EE::error( 'docker not installed or not running.' );
-		}
-
-		$docker_compose_installed = 'command -v docker-compose > /dev/null';
-		if ( ! EE::exec( $docker_compose_installed ) ) {
-			EE::error( 'EasyEngine requires docker-compose.' );
-		}
-
-		if ( version_compare( PHP_VERSION, '7.2.0' ) < 0 ) {
-			EE::error( 'EasyEngine requires minimum PHP 7.2.0 to run.' );
-		}
-
 		$this->ensure_present_in_config( 'locale', 'en_US' );
 		$this->ensure_present_in_config( 'ee_installer_version', 'stable' );
 
@@ -76,7 +61,31 @@ private function init_ee() {
 		if ( ! is_dir( $db_dir ) ) {
 			mkdir( $db_dir );
 		}
-		$this->maybe_trigger_migration();
+
+		if (
+			! empty( $this->arguments ) &&
+			 ( 'help' !== $this->arguments[0] )
+			 && $this->arguments !== [ 'cli', 'version' ]
+			)
+		 {
+
+			// Minimum requirement checks.
+			$docker_running = 'docker ps > /dev/null';
+			if ( ! EE::exec( $docker_running ) ) {
+				EE::error( 'docker not installed or not running.' );
+			}
+
+			$docker_compose_installed = 'command -v docker-compose > /dev/null';
+			if ( ! EE::exec( $docker_compose_installed ) ) {
+				EE::error( 'EasyEngine requires docker-compose.' );
+			}
+
+			if ( version_compare( PHP_VERSION, '7.2.0' ) < 0 ) {
+				EE::error( 'EasyEngine requires minimum PHP 7.2.0 to run.' );
+			}
+
+			$this->maybe_trigger_migration();
+		}
 	}
 
 	/**