Merge branch 'develop' for v4.10.0

Author: mrrobot47

.github/workflows/test_and_build.yml

@@ -92,7 +92,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
     - name: Check out source code
       uses: actions/checkout@v3

VERSION

@@ -1 +1 @@
-4.9.3
+4.10.0

composer.json

@@ -35,14 +35,14 @@
         "easyengine/auth-command": "v1.2.1",
         "easyengine/config-command": "v1.1.0",
         "easyengine/cron-command": "v2.1.0",
-        "easyengine/dash-command": "v1.0.0",
+        "easyengine/dash-command": "v1.0.1",
         "easyengine/log-command": "v1.1.0",
         "easyengine/mailhog-command": "v1.0.3",
         "easyengine/service-command": "v1.6.2",
         "easyengine/shell-command": "v1.1.3",
-        "easyengine/site-command": "v3.6.1",
-        "easyengine/site-type-php": "v1.9.3",
-        "easyengine/site-type-wp": "v1.9.1",
+        "easyengine/site-command": "v3.7.1",
+        "easyengine/site-type-php": "v1.10.0",
+        "easyengine/site-type-wp": "v1.10.0",
         "monolog/monolog": "1.24.0",
         "mustache/mustache": "2.14.1",
         "rmccue/requests": "^2.0",

composer.lock

@@ -1,8 +1,8 @@
 {
-    "easyengine/cron": "v4.9.1",
+    "easyengine/cron": "v4.10.0",
     "easyengine/mailhog": "v4.6.5",
     "easyengine/mariadb": "v4.9.1",
-    "easyengine/nginx-proxy": "v4.9.1",
+    "easyengine/nginx-proxy": "v4.10.0",
     "easyengine/nginx": "v4.7.6",
     "easyengine/php": "v4.6.6",
     "easyengine/php5.6": "v4.7.4",
@@ -13,9 +13,10 @@
     "easyengine/php8.0": "v4.8.1",
     "easyengine/php8.1": "v4.9.0",
     "easyengine/php8.2": "v4.9.1",
-    "easyengine/php8.3": "v4.9.1",
-    "easyengine/php8.4": "v4.9.1",
+    "easyengine/php8.3": "v4.10.0",
+    "easyengine/php8.4": "v4.10.0",
+    "easyengine/php8.5": "v4.10.0",
     "easyengine/postfix": "v4.8.1",
-    "easyengine/redis": "v4.9.1",
-    "easyengine/newrelic-daemon": "v4.9.0"
+    "easyengine/redis": "v4.10.0",
+    "easyengine/newrelic-daemon": "v4.10.0"
 }

img-versions.json

@@ -4,6 +4,7 @@
 
 use EE;
 use EE\Migration\Base;
+use Symfony\Component\Process\Process;
 
 class InsertDockerImagesVersion extends Base {
 
@@ -37,18 +38,50 @@ public function up() {
 			'easyengine/php7.2',
 			'easyengine/php7.3',
 			'easyengine/php7.4',
+			'easyengine/php',
 			'easyengine/php8.0',
 			'easyengine/php8.1',
+			'easyengine/mailhog',
 			'easyengine/newrelic-daemon',
 		];
+
+		$pull_queue = [];
 		foreach ( $images as $image => $tag ) {
 			if ( in_array( $image, $skip_download ) ) {
 				continue;
 			}
-			EE::log( "Checking and Pulling docker image $image:$tag" );
-			if ( ! \EE::exec( "docker pull ${image}:${tag}", true, true ) ) {
-				throw new \Exception( "Unable to pull ${image}:${tag}. Please check logs for more details." );
+			$pull_queue[] = [ $image, $tag ];
+		}
+
+		$concurrency = 4;
+		$running = [];
+		$successful_pulls = [];
+
+		while ( ! empty( $pull_queue ) || ! empty( $running ) ) {
+			// Start new processes if under concurrency limit
+			while ( count( $running ) < $concurrency && ! empty( $pull_queue ) ) {
+				list( $image, $tag ) = array_shift( $pull_queue );
+				EE::log( "Checking and Pulling docker image $image:$tag" );
+				$process = new Process( [ 'docker', 'pull', "$image:$tag" ] );
+				$process->start();
+				$running[] = [ $process, $image, $tag ];
 			}
+
+			// Check for finished processes
+			foreach ( $running as $key => list( $process, $image, $tag ) ) {
+				if ( ! $process->isRunning() ) {
+					if ( ! $process->isSuccessful() ) {
+						throw new \Exception( "Unable to pull $image:$tag: " . $process->getErrorOutput() );
+					}
+					$successful_pulls[] = [ $image, $tag ];
+					unset( $running[ $key ] );
+				}
+			}
+
+			usleep( 100000 ); // Sleep 100ms to avoid busy loop
+		}
+
+		foreach ( $successful_pulls as list( $image, $tag ) ) {
 			$query .= "INSERT INTO options VALUES( '${image}', '${tag}' );";
 		}
 

migrations/db/20181016052850_easyengine_insert_docker_images_version.php

@@ -156,9 +156,9 @@ private function format( $items, $ascii_pre_colorized = false ) {
 
 				if ( 'json' === $this->args['format'] ) {
 					if ( defined( 'JSON_PARTIAL_OUTPUT_ON_ERROR' ) ) {
-						echo json_encode( $out, JSON_PARTIAL_OUTPUT_ON_ERROR );
+						echo json_encode( $out, JSON_PRETTY_PRINT | JSON_PARTIAL_OUTPUT_ON_ERROR );
 					} else {
-						echo json_encode( $out );
+						echo json_encode( $out, JSON_PRETTY_PRINT );
 					}
 				} elseif ( 'yaml' === $this->args['format'] ) {
 					echo Spyc::YAMLDump( $out, 2, 0 );
@@ -200,7 +200,7 @@ private function show_single_field( $items, $field ) {
 		}
 
 		if ( 'json' == $this->args['format'] ) {
-			echo json_encode( $values );
+			echo json_encode( $values, JSON_PRETTY_PRINT );
 		}
 	}
 

php/EE/Formatter.php

@@ -39,6 +39,7 @@ public static function start_container_migration() {
 			'easyengine/php8.2',
 			'easyengine/php8.3',
 			'easyengine/php8.4',
+			'easyengine/php8.5',
 			'easyengine/newrelic-daemon',
 		];
 
@@ -140,7 +141,7 @@ public static function update_docker_compose() {
 			$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_new_path && chmod +x $docker_compose_new_path" );