Merge branch 'develop-v4' into check/min-requirements

Author: mbtamuli

migrations/db/20181016052850_easyengine_insert_docker_images_version.php

@@ -27,13 +27,13 @@ public function __construct() {
 	 */
 	public function up() {
 
-		EE::log( 'Checking/Pulling required images' );
+		EE::log( 'Checking and Pulling required images. This may take some time.' );
 		$images = EE\Utils\get_image_versions();
 
 		$query = '';
 		foreach ( $images as $image => $tag ) {
-			EE::debug( "Checking/Pulling docker image $image:$tag" );
-			if ( ! \EE::exec( "docker pull ${image}:${tag}" ) ) {
+			EE::log( "Checking and Pulling docker image $image:$tag" );
+			if ( ! \EE::exec( "docker pull ${image}:${tag}", true, true ) ) {
 				throw new \Exception( "Unable to pull ${image}:${tag}. Please check logs for more details." );
 			}
 			$query .= "INSERT INTO options VALUES( '${image}', '${tag}' );";

php/EE/Migration/SiteContainers.php

@@ -182,6 +182,16 @@ public static function backup_restore( $source, $destination = '', $delete_diffe
 		}
 	}
 
+	/**
+	 * Function to delete file/directory.
+	 *
+	 * @param string|array $path_to_delete File(s)/Director(y/ies) to be deleted.
+	 */
+	public static function delete( $path_to_delete ) {
+		$fs = new Filesystem();
+		$fs->remove( $path_to_delete );
+	}
+
 	/**
 	 * Function to reload site's nginx.
 	 *

php/EE/Runner.php

@@ -85,12 +85,9 @@ private function init_ee() {
 	private function migrate() {
 		$rsp = new \EE\RevertableStepProcessor();
 
-		$version = Option::where( 'key', 'version' );
-		if ( ! empty( $version ) ) {
-			$rsp->add_step( 'ee-custom-container-migrations', 'EE\Migration\CustomContainerMigrations::execute_migrations' );
-			$rsp->add_step( 'ee-docker-image-migrations', 'EE\Migration\Containers::start_container_migration' );
-		}
 		$rsp->add_step( 'ee-db-migrations', 'EE\Migration\Executor::execute_migrations' );
+		$rsp->add_step( 'ee-custom-container-migrations', 'EE\Migration\CustomContainerMigrations::execute_migrations' );
+		$rsp->add_step( 'ee-docker-image-migrations', 'EE\Migration\Containers::start_container_migration' );
 		return $rsp->execute();
 	}