Merge pull request #1831 from mrrobot47/update/docker-migration1

Update Docker Migration
EasyEngine · May 13, 2024 · e75ecaf · e75ecaf
2 parents 04fb9c9 + 36f61eb
commit e75ecaf
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php
@@ -4,6 +4,7 @@
 
 use EE;
 use EE\Migration\Base;
+use Symfony\Component\Filesystem\Filesystem;
 
 class CheckAndUpdateDockerOne extends Base {
 
@@ -15,7 +16,7 @@ class CheckAndUpdateDockerOne extends Base {
  public function up() {
 
  EE::log( 'Checking Docker version.' );
- $docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout;
+ $docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout );
 
  if ( version_compare( $docker_version, '20.10.10', '<' ) ) {
  EE::warning( 'Docker version should be 20.10.10 or above.' );
@@ -33,11 +34,31 @@ public function up() {
  }
  }
 
+ EE::log( 'Checking docker-compose version' );
+ $docker_compose_version = trim( 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_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( '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" );
+ }
+
  // Check the version again post update.
- $docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout;
+ $docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout );
  if ( version_compare( $docker_version, '20.10.10', '<' ) ) {
  EE::error( 'Docker version should be 20.10.10 or above. Please update Docker and try again.' );
  }
+
+ $docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout );
+ if ( version_compare( '1.29.2', $docker_compose_version, '!=' ) ) {
+ EE::error( 'Docker-compose version should be 1.29.2. Please update Docker-compose and try again.' );
+ }
  }
 
  /**

diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php
@@ -123,7 +123,7 @@ public static function image_cleanup() {
  }
 
  /**
- * Update docker-compose to v2.26.1 if lower version is installed.
+ * Update docker-compose to v2.27.0 if lower version is installed.
  */
  public static function update_docker_compose() {
 
@@ -137,8 +137,8 @@ public static function update_docker_compose() {
  }
  $fs->copy( $docker_compose_path, $docker_compose_backup_path );
 
- if ( version_compare( '2.26.1', $docker_compose_version, '>' ) ) {
- EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" );
+ if ( version_compare( '2.27.0', $docker_compose_version, '>' ) ) {
+ 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" );
  }
  }
 

diff --git a/php/EE/Runner.php b/php/EE/Runner.php
@@ -105,10 +105,10 @@ public function check_requirements( $show_error = true ) {
  $error[] = 'EasyEngine requires docker-compose.';
  }
 
- $docker_compose_version = EE::launch( 'docker-compose version --short' )->stdout;
- if ( version_compare( $docker_compose_version, '2.26.0', '<' ) ) {
+ $docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout );
+ if ( version_compare( $docker_compose_version, '2.26.1', '<' ) ) {
  if ( $show_error ) {
- EE::warning( 'EasyEngine requires docker-compose version 2.26.0 or greater.' );
+ EE::warning( 'EasyEngine requires docker-compose version 2.26.1 or greater.' );
  EE::warning( 'You can get the updated version of docker-compose from assets in https://github.com/docker/compose/releases/tag/v2.26.1' );
  }
  }