Merge pull request #1838 from mrrobot47/update/site-migrations

Update site service migrations

Author: mrrobot47

php/EE/Migration/Containers.php

@@ -128,9 +128,8 @@ public static function image_cleanup() {
 	 */
 	public static function update_docker_compose() {
 
-		$docker_compose_version     = EE::launch( 'docker-compose version --short' )->stdout;
-		$docker_compose_path        = EE::launch( 'command -v docker-compose' )->stdout;
-		$docker_compose_path        = trim( $docker_compose_path );
+		$docker_compose_version     = trim( EE::launch( 'docker-compose version --short' )->stdout );
+		$docker_compose_path        = trim( EE::launch( 'command -v docker-compose' )->stdout );
 		$docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup';
 		$docker_compose_new_path    = EE_BACKUP_DIR . '/docker-compose';
 

php/EE/Migration/SiteContainers.php

@@ -70,13 +70,19 @@ public static function revert_site_docker_compose_file( $source_path, $destinati
 	 * @return bool
 	 */
 	public static function is_site_service_image_changed( $updated_images, $site_info ) {
+
 		chdir( $site_info['site_fs_path'] );
-		$launch   = EE::launch( 'docker-compose config --services' );
-		$services = explode( PHP_EOL, trim( $launch->stdout ) );
+		$launch      = EE::launch( 'docker-compose images' );
+		$lines       = explode( PHP_EOL, trim( $launch->stdout ) );
+		$site_images = [];
+
+		for ( $i = 1; $i < count( $lines ); $i ++ ) {
+			$columns = preg_split( '/\s+/', $lines[ $i ] );
 
-		$site_images = array_map( function ( $service ) {
-			return 'easyengine/' . $service;
-		}, $services );
+			if ( isset( $columns[1] ) ) {
+				$site_images[] = $columns[1];
+			}
+		}
 
 		$common_image = array_intersect( $updated_images, $site_images );