Merge branch 'mrrobot47-update/for-migrations' into develop-v4

Author: mbtamuli

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

@@ -70,12 +70,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();
 	}
 

php/class-ee-docker.php

@@ -153,8 +153,8 @@ public static function disconnect_site_network_from( $site_name, $from_container
 	/**
 	 * Function to boot the containers.
 	 *
-	 * @param String $dir      Path to docker-compose.yml.
-	 * @param array  $services Services to bring up.
+	 * @param String $dir     Path to docker-compose.yml.
+	 * @param array $services Services to bring up.
 	 *
 	 * @return bool success.
 	 */
@@ -187,7 +187,7 @@ public static function docker_network_exists( string $network ) {
 	/**
 	 * Function to destroy the containers.
 	 *
-	 * @param String $dir      Path to docker-compose.yml.
+	 * @param String $dir Path to docker-compose.yml.
 	 *
 	 * @return bool success.
 	 */
@@ -234,7 +234,10 @@ public static function get_docker_style_prefix( $site_url ) {
 	 * @param string $prefix                Prefix by volumes have to be created.
 	 * @param array $volumes                The volumes to be created.
 	 *                                      $volumes[$key]['name'] => specifies the name of volume to be created.
-	 *                                      $volumes[$key]['path_to_symlink'] => specifies the path to symlink the created volume.
+	 *                                      $volumes[$key]['path_to_symlink'] => specifies the path to symlink the
+	 *                                      created volume.
+	 *                                      $volumes[$key]['skip_volume'] => if set to `true` will skip volume creation
+	 *                                      for that entry.
 	 * @param bool $update_to_docker_prefix Update the prefix in dockerized style.
 	 */
 	public static function create_volumes( $prefix, $volumes, $update_to_docker_prefix = true ) {
@@ -247,6 +250,9 @@ public static function create_volumes( $prefix, $volumes, $update_to_docker_pref
 		$docker_root_dir = trim( $launch->stdout );
 
 		foreach ( $volumes as $volume ) {
+			if ( ! empty( $volume['skip_volume'] ) && true === $volume['skip_volume'] ) {
+				continue;
+			}
 			$fs->mkdir( dirname( $volume['path_to_symlink'] ) );
 			EE::exec(
 				sprintf(
@@ -275,4 +281,33 @@ public static function get_volumes_by_label( $label ) {
 
 		return array_filter( explode( PHP_EOL, trim( $launch->stdout ) ), 'trim' );
 	}
+
+	/**
+	 * Function to return minimal docker-compose `host:container` volume mounting array.
+	 *
+	 * @param array $extended_vols :
+	 *                             $extended_vols['name'] - Host path for docker-compose generation in linux
+	 *                             $extended_vols['path_to_symlink'] - Host path for docker-compose generation in
+	 *                             darwin.
+	 *                             $extended_vols['container_path'] - Path inside container, common for linux and
+	 *                             darwin.
+	 *                             $extended_vols['skip_darwin'] - if set to true skips that volume for darwin.
+	 *                             $extended_vols['skip_linux'] - if set to true skips that volume for linux.
+	 *
+	 * @return array having docker-compose `host:container` volume mounting.
+	 */
+	public static function get_mounting_volume_array( $extended_vols ) {
+
+		$volume_gen_key      = IS_DARWIN ? 'path_to_symlink' : 'name';
+		$skip_key            = IS_DARWIN ? 'skip_darwin' : 'skip_linux';
+		$final_mount_volumes = [];
+		foreach ( $extended_vols as $extended_vol ) {
+			if ( ! empty( $extended_vol[ $skip_key ] ) && true === $extended_vol[ $skip_key ] ) {
+				continue;
+			}
+			$final_mount_volumes[] = $extended_vol[ $volume_gen_key ] . ':' . $extended_vol['container_path'];
+		}
+
+		return $final_mount_volumes;
+	}
 }

php/class-ee.php

@@ -94,7 +94,7 @@ public static function get_cache() {
 
 		if ( ! $cache ) {
 			$home = Utils\get_home_dir();
-			$dir = getenv( 'EE_CACHE_DIR' ) ? : '/opt/easyengine/.cache/';
+			$dir = getenv( 'EE_CACHE_DIR' ) ? : EE_ROOT_DIR . '/.cache/';
 
 			// 6 months, 300mb
 			$cache = new FileCache( $dir, 15552000, 314572800 );

php/commands/src/CLI_Command.php

@@ -507,8 +507,7 @@ public function self_uninstall( $args, $assoc_args ) {
 			$fs->remove( $sites_paths );
 		}
 
-		EE::exec( "rm -df $home/ee-sites/" );
-		EE::exec( "rm -rf /opt/easyengine/" );
+		EE::exec( "rm -rf " . EE_ROOT_DIR );
 
 		if ( Utils\inside_phar() ) {
 			unlink( realpath( $_SERVER['argv'][0] ) );

php/init-ee.php

@@ -4,8 +4,16 @@
 define( 'EE', true );
 define( 'EE_VERSION', trim( file_get_contents( EE_ROOT . '/VERSION' ) ) );
 define( 'EE_START_MICROTIME', microtime( true ) );
-define( 'EE_ROOT_DIR', '/opt/easyengine' );
-define( 'EE_BACKUP_DIR', '/opt/easyengine/.backup' );
+define( 'IS_DARWIN', 'Darwin' === php_uname( 's' ) );
+
+if ( IS_DARWIN ) {
+	define( 'EE_ROOT_DIR', rtrim( getenv( 'HOME' ), '/\\' ) . '/easyengine' );
+} else {
+	define( 'EE_ROOT_DIR', '/opt/easyengine' );
+}
+
+define( 'EE_BACKUP_DIR', EE_ROOT_DIR . '/.backup' );
+define( 'EE_SERVICE_DIR', EE_ROOT_DIR . '/services' );
 define( 'EE_PROXY_TYPE', 'ee-global-nginx-proxy' );
 
 if ( file_exists( EE_ROOT . '/vendor/autoload.php' ) ) {