Merge branch 'sagarnasit-fix-down-time' into develop

mrrobot47 · mrrobot47 · commit f0c8060b7664 · 2018-12-26T18:21:45.000+05:30
diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php
@@ -156,6 +156,17 @@ private static function migrate_global_containers( $updated_images ) {
 			[ $global_compose_file_backup_path, $global_compose_file_path, $updated_global_images ]
 		);
 
+		/**
+		 * Create support containers.
+		 */
+		self::$rsp->add_step(
+			'create-support-global-containers',
+			'EE\Migration\GlobalContainers::enable_support_containers',
+			'EE\Migration\GlobalContainers::disable_support_containers',
+			null,
+			null
+		);
+
 		self::$rsp->add_step(
 			'stop-global-containers',
 			'EE\Migration\GlobalContainers::down_global_containers',
@@ -175,7 +186,8 @@ private static function migrate_global_containers( $updated_images ) {
 		$all_global_images = GlobalContainers::get_all_global_images_with_service_name();
 		foreach ( $updated_global_images as $image_name ) {
 			$global_container_name = $all_global_images[ $image_name ];
-			$global_service_name   = ltrim( $global_container_name, 'ee-' );
+			$global_service_name   = ltrim( $global_container_name, 'services_' );
+			$global_service_name   = rtrim( $global_service_name, '_1' );
 			self::$rsp->add_step(
 				"upgrade-$global_container_name-container",
 				"EE\Migration\GlobalContainers::global_service_up",
@@ -184,6 +196,17 @@ private static function migrate_global_containers( $updated_images ) {
 				[ $global_service_name ]
 			);
 		}
+
+		/**
+		 * Remove support containers.
+		 */
+		self::$rsp->add_step(
+			'remove-support-global-containers',
+			'EE\Migration\GlobalContainers::disable_support_containers',
+			'EE\Migration\GlobalContainers::enable_support_containers',
+			null,
+			null
+		);
 	}
 
 	/**
@@ -210,11 +233,23 @@ public static function migrate_site_containers( $updated_images ) {
 			$ee_site_object = SiteContainers::get_site_object( $site['site_type'] );
 
 			if ( $site['site_enabled'] ) {
+
+				/**
+				 * Enable support containers.
+				 */
+				self::$rsp->add_step(
+					sprintf( 'enable-support-containers-%s', $site['site_url'] ),
+					'EE\Migration\SiteContainers::enable_support_containers',
+					'EE\Migration\SiteContainers::disable_support_containers',
+					[ $site['site_url'], $site['site_fs_path'] ],
+					[ $site['site_url'], $site['site_fs_path'] ]
+				);
+
 				self::$rsp->add_step(
 					"disable-${site['site_url']}-containers",
-					'EE\Migration\SiteContainers::disable_site',
-					'EE\Migration\SiteContainers::enable_site',
-					[ $site, $ee_site_object ],
+					'EE\Migration\SiteContainers::disable_default_containers',
+					'EE\Migration\SiteContainers::enable_default_containers',
+					[ $site ],
 					[ $site, $ee_site_object ]
 				);
 			}
@@ -238,11 +273,22 @@ public static function migrate_site_containers( $updated_images ) {
 			if ( $site['site_enabled'] ) {
 				self::$rsp->add_step(
 					"upgrade-${site['site_url']}-containers",
-					'EE\Migration\SiteContainers::enable_site',
-					'EE\Migration\SiteContainers::enable_site',
+					'EE\Migration\SiteContainers::enable_default_containers',
+					'EE\Migration\SiteContainers::enable_default_containers',
 					[ $site, $ee_site_object ],
 					[ $site, $ee_site_object ]
 				);
+
+				/**
+				 * Disable support containers.
+				 */
+				self::$rsp->add_step(
+					sprintf( 'disable-support-containers-%s', $site['site_url'] ),
+					'EE\Migration\SiteContainers::disable_support_containers',
+					'EE\Migration\SiteContainers::enable_support_containers',
+					[ $site['site_url'], $site['site_fs_path'] ],
+					[ $site['site_url'], $site['site_fs_path'] ]
+				);
 			}
 		}
 	}
diff --git a/php/EE/Migration/GlobalContainers.php b/php/EE/Migration/GlobalContainers.php
@@ -3,6 +3,7 @@
 namespace EE\Migration;
 
 use EE;
+use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Upgrade existing global containers to new docker-image
@@ -43,7 +44,7 @@ public static function revert_global_containers( $source_path, $dest_path, $upda
 		$all_global_images      = self::get_all_global_images_with_service_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-' ) ) . ' ';
+			$services_to_regenerate .= ltrim( rtrim( $global_container_name, '_1' ), 'services_' ) . ' ';
 		}
 		if ( empty( trim( $services_to_regenerate ) ) ) {
 			return;
@@ -74,7 +75,8 @@ public static function down_global_containers( $updated_images ) {
 
 		foreach ( $updated_images as $image_name ) {
 			$global_container_name = $all_global_images[ $image_name ];
-			$global_service_name   = ltrim( $global_container_name, 'ee-' );
+			$global_service_name   = ltrim( $global_container_name, 'services_' );
+			$global_service_name   = rtrim( $global_service_name, '_1' );
 			EE::debug( "Removing  $global_container_name" );
 
 			if ( false !== \EE_DOCKER::container_status( $global_container_name ) ) {
@@ -129,4 +131,32 @@ public static function get_all_global_images_with_service_name() {
 			// 'easyengine/cron'        => EE_CRON_SCHEDULER, //TODO: Add it to global docker-compose.
 		];
 	}
+
+	/**
+	 * Create support containers for global-db and global-redis service.
+	 */
+	public static function enable_support_containers() {
+		if ( ! chdir( EE_SERVICE_DIR ) ) {
+			throw new \Exception( sprintf( '%s path does not exist', EE_SERVICE_DIR ) );
+		}
+
+		$command = 'docker-compose --project-name=ee up -d global-db global-redis';
+		if ( ! EE::exec( $command ) ) {
+			throw new \Exception( 'Unable to create support container.' );
+		}
+	}
+
+	/**
+	 * Remove support containers for global-db and global-redis service.
+	 */
+	public static function disable_support_containers() {
+		if ( ! chdir( EE_SERVICE_DIR ) ) {
+			throw new \Exception( sprintf( '%s path does not exist', EE_SERVICE_DIR ) );
+		}
+
+		$command = 'docker-compose --project-name=ee down';
+		if ( ! EE::exec( $command ) ) {
+			throw new \Exception( 'Unable to remove support container.' );
+		}
+	}
 }
diff --git a/php/EE/Migration/SiteContainers.php b/php/EE/Migration/SiteContainers.php
@@ -103,31 +103,42 @@ public static function generate_site_docker_compose_file( $site_info, $site_obje
 	/**
 	 * Enable site.
 	 *
-	 * @param array $site_info    array of site information.
+	 * @param array  $site_info   array of site information.
 	 * @param object $site_object object of site-type( HTML, PHP, WordPress ).
 	 *
 	 * @throws \Exception
 	 */
-	public static function enable_site( $site_info, $site_object ) {
-		EE::debug( "Start enabling ${site_info['site_url']}" );
+	public static function enable_default_containers( $site_info, $site_object ) {
+		EE::debug( "Start enabling default containers of ${site_info['site_url']}" );
+
 		try {
 			$site_object->enable( [ $site_info['site_url'] ], [ 'force' => true ], false );
 		} catch ( \Exception $e ) {
 			throw new \Exception( $e->getMessage() );
 		}
-		EE::debug( "Complete enabling ${site_info['site_url']}" );
+
+		EE::debug( "Complete enabling default containers of ${site_info['site_url']}" );
 	}
 
 	/**
 	 * Disable site.
 	 *
-	 * @param array $site_info    array of site information.
-	 * @param object $site_object object of site-type( HTML, PHP, Wordpress ).
+	 * @param array $site_info array of site information.
+	 *
+	 * @throws \Exception
 	 */
-	public static function disable_site( $site_info, $site_object ) {
-		EE::debug( "Start disabling ${site_info['site_url']}" );
-		$site_object->disable( [ $site_info['site_url'] ], [] );
-		EE::debug( "Complete disabling ${site_info['site_url']}" );
+	public static function disable_default_containers( $site_info ) {
+		EE::debug( "Start disabling default containers of ${site_info['site_url']}" );
+
+		if ( ! chdir( $site_info['site_fs_path'] ) ) {
+			throw new \Exception( sprintf( '%s path does not exist', $site_info['site_fs_path'] ) );
+		}
+
+		if ( ! EE::exec( 'docker-compose stop && docker-compose rm -f' ) ) {
+			throw new \Exception( sprintf( 'Something went wrong on disable site %s', $site_info['site_url'] ) );
+		}
+
+		EE::debug( "Complete disabling default containers of ${site_info['site_url']}" );
 	}
 
 	/**
@@ -219,4 +230,56 @@ public static function docker_compose_pull( $site_fs_path ) {
 			throw new \Exception( 'Could pull given images.' );
 		}
 	}
+
+	/**
+	 * Enable support containers for sites.
+	 *
+	 * @param $site_url string Site URL.
+	 * @param $site_fs_path string File system path of site.
+	 *
+	 * @throws \Exception
+	 */
+	public static function enable_support_containers( $site_url, $site_fs_path ) {
+		EE::debug( sprintf( 'Start enabling containers for %s', $site_url ) );
+
+		$site_name    = str_replace( '.', '', $site_url );
+		$project_name = sprintf( 'update-ee-%s', $site_name );
+
+		if ( ! chdir( $site_fs_path ) ) {
+			throw new \Exception( sprintf( '%s does not exist.', $site_fs_path ) );
+		}
+
+		$command = sprintf( 'docker-compose --project-name=%s up -d nginx', $project_name );
+		if ( ! EE::exec( $command ) ) {
+			throw new \Exception( sprintf( 'Unable to create support container for %s', $site_url ) );
+		}
+
+		EE::debug( sprintf( 'Complete enabling support containers for %s', $site_url ) );
+	}
+
+	/**
+	 * Disable support containers for sites.
+	 *
+	 * @param $site_url string Site URL.
+	 * @param $site_fs_path string File system path of site.
+	 *
+	 * @throws \Exception
+	 */
+	public static function disable_support_containers( $site_url, $site_fs_path ) {
+		EE::debug( sprintf( 'Start disabling support containers for %s', $site_url ) );
+
+		$site_name    = str_replace( '.', '', $site_url );
+		$project_name = sprintf( 'update-ee-%s', $site_name );
+
+		if ( ! chdir( $site_fs_path ) ) {
+			throw new \Exception( sprintf( '%s does not exist.', $site_fs_path ) );
+		}
+
+		$command = sprintf( 'docker-compose --project-name=%1$s stop && docker-compose --project-name=%1$s rm -f', $project_name );
+		if ( ! EE::exec( $command ) ) {
+			throw new \Exception( sprintf( 'Unable to remove support container for %s', $site_url ) );
+		}
+
+		EE::debug( sprintf( 'Complete disabling support containers for %s', $site_url ) );
+	}
 }
diff --git a/php/init-ee.php b/php/init-ee.php
@@ -14,7 +14,7 @@
 
 define( 'EE_BACKUP_DIR', EE_ROOT_DIR . '/.backup' );
 define( 'EE_SERVICE_DIR', EE_ROOT_DIR . '/services' );
-define( 'EE_PROXY_TYPE', 'ee-global-nginx-proxy' );
+define( 'EE_PROXY_TYPE', 'services_global-nginx-proxy_1' );
 
 if ( file_exists( EE_ROOT . '/vendor/autoload.php' ) ) {
 	define( 'EE_VENDOR_DIR', EE_ROOT . '/vendor' );
