Merge pull request #1833 from mrrobot47/update/migration

Skip migration if first execution and minor fixes

Author: mrrobot47

.github/workflows/test_and_build.yml

@@ -127,7 +127,7 @@ jobs:
 
     - name: Install docker-compose
       run: |
-        sudo curl -L https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+        sudo curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
         sudo chmod +x /usr/local/bin/docker-compose
 
     - name: Install dependencies

migrations/db/20240502102550_easyengine_check_and_update_docker_one.php

@@ -8,13 +8,26 @@
 
 class CheckAndUpdateDockerOne extends Base {
 
+	public function __construct() {
+
+		if ( $this->is_first_execution ) {
+			$this->skip_this_migration = true;
+		}
+	}
+
 	/**
 	 * Execute create table query for site and sitemeta table.
 	 *
 	 * @throws EE\ExitException
 	 */
 	public function up() {
 
+		if ( $this->skip_this_migration ) {
+			EE::debug( 'Skipping migration as it is not needed.' );
+
+			return;
+		}
+
 		EE::log( 'Checking Docker version.' );
 		$docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout );
 
@@ -45,7 +58,7 @@ public function up() {
 		}
 		$fs->copy( $docker_compose_path, $docker_compose_backup_path );
 
-		if ( version_compare( '1.29.2', $docker_compose_version, '>' ) ) {
+		if ( version_compare( '1.29.2', $docker_compose_version, '!=' ) ) {
 			EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" );
 		}
 

php/EE/Migration/Containers.php

@@ -58,6 +58,7 @@ public static function start_container_migration() {
 		}
 
 		if ( empty( $updated_images ) ) {
+
 			return;
 		}
 
@@ -131,13 +132,15 @@ public static function update_docker_compose() {
 		$docker_compose_path        = EE::launch( 'command -v docker-compose' )->stdout;
 		$docker_compose_path        = trim( $docker_compose_path );
 		$docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup';
-		$fs                         = new Filesystem();
-		if ( ! $fs->exists( EE_BACKUP_DIR ) ) {
-			$fs->mkdir( EE_BACKUP_DIR );
-		}
-		$fs->copy( $docker_compose_path, $docker_compose_backup_path );
 
 		if ( version_compare( '2.27.0', $docker_compose_version, '>' ) ) {
+
+			$fs = new Filesystem();
+			if ( ! $fs->exists( EE_BACKUP_DIR ) ) {
+				$fs->mkdir( EE_BACKUP_DIR );
+			}	
+			$fs->copy( $docker_compose_path, $docker_compose_backup_path );
+
 			EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" );
 		}
 	}

php/EE/Runner.php

@@ -138,6 +138,7 @@ private function migrate() {
 		$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' );
+		$rsp->add_step( 'ee-update-docker-compose', 'EE\Migration\Containers::update_docker_compose' );
 		return $rsp->execute();
 	}