Merge pull request #1406 from mrrobot47/fix/migration-of-proxy-container

Fix migration of nginx-proxy container

Author: mbtamuli

img-versions.json

@@ -2,7 +2,7 @@
     "easyengine/cron": "v4.0.0",
     "easyengine/mailhog": "v4.0.0",
     "easyengine/mariadb": "v4.0.0",
-    "easyengine/nginx-proxy": "v4.0.1",
+    "easyengine/nginx-proxy": "v4.0.2",
     "easyengine/nginx": "v4.0.0",
     "easyengine/php": "v4.0.2",
     "easyengine/php5.6": "v4.0.0",

php/EE/Migration/GlobalContainers.php

@@ -76,8 +76,9 @@ 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, 'services_' );
-			$global_service_name   = rtrim( $global_service_name, '_1' );
-			EE::debug( "Removing  $global_container_name" );
+			$remove_suffix         = explode( '_1', $global_service_name );
+			$global_service_name   = empty( $remove_suffix[0] ) ? $global_service_name : $remove_suffix[0];
+			EE::debug( "Removing $global_container_name" );
 
 			if ( false !== \EE_DOCKER::container_status( $global_container_name ) ) {
 				if ( ! EE::exec( "docker-compose stop $global_service_name && docker-compose rm -f $global_service_name" ) ) {
@@ -94,8 +95,11 @@ public static function down_global_containers( $updated_images ) {
 	 * @throws \Exception
 	 */
 	public static function global_service_up( $service_name ) {
+		$global_service_name = ltrim( $service_name, 'services_' );
+		$remove_suffix       = explode( '_1', $global_service_name );
+		$global_service_name = empty( $remove_suffix[0] ) ? $global_service_name : $remove_suffix[0];
 		EE::debug( 'Start ' . $service_name . ' container up' );
-		if ( 'global-nginx-proxy' === $service_name ) {
+		if ( 'global-nginx-proxy' === $global_service_name ) {
 			\EE\Service\Utils\nginx_proxy_check();
 		} else {
 			\EE\Service\Utils\init_global_container( $service_name );