Merge branch 'master' of https://github.com/easyengine/easyengine

Author: rtBot

VERSION

@@ -1 +1 @@
-4.10.1
+4.10.2

composer.json

@@ -28,7 +28,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.0",
-        "composer/composer": "2.2.24",
+        "composer/composer": "2.2.26",
         "composer/semver": "3.2.4",
         "daverandom/libdns": "^2.0",
         "easyengine/admin-tools-command": "v1.1.1",
@@ -40,7 +40,7 @@
         "easyengine/mailhog-command": "v1.0.3",
         "easyengine/service-command": "v1.6.2",
         "easyengine/shell-command": "v1.1.3",
-        "easyengine/site-command": "v3.7.2",
+        "easyengine/site-command": "v3.7.3",
         "easyengine/site-type-php": "v1.10.0",
         "easyengine/site-type-wp": "v1.10.0",
         "monolog/monolog": "1.24.0",

composer.lock

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

img-versions.json

@@ -92,11 +92,25 @@ public function check_requirements( $show_error = true ) {
 		$status         = true;
 		$error          = [];
 
-		$docker_running_cmd = 'docker ps > /dev/null';
-		if ( ! EE::exec( $docker_running_cmd ) ) {
-			$status         = false;
-			$docker_running = false;
-			$error[]        = 'Docker not installed or not running.';
+		// Retry logic for Docker availability check to handle transient failures under system load.
+		$docker_running_cmd = 'docker ps > /dev/null 2>&1';
+		$max_retries        = 4;
+
+		for ( $attempt = 1; $attempt <= $max_retries; $attempt++ ) {
+			if ( EE::exec( $docker_running_cmd ) ) {
+				break; // Docker is available, exit retry loop.
+			}
+
+			if ( $attempt < $max_retries ) {
+				$retry_delay = pow( 2, $attempt - 1 ); // Exponential backoff: 1s, 2s, 4s
+				EE::debug( "Docker check failed (attempt {$attempt}/{$max_retries}), retrying in {$retry_delay}s...", 'bootstrap' );
+				sleep( $retry_delay );
+			} else {
+				// All retries exhausted.
+				$status         = false;
+				$docker_running = false;
+				$error[]        = "Docker not installed or not running (checked {$max_retries} times).";
+			}
 		}
 
 		$docker_compose_installed = 'command -v docker-compose > /dev/null';
@@ -749,17 +763,17 @@ private function set_alias( $alias ) {
 
 	public function start() {
 
+		EE::debug( $this->_global_config_path_debug, 'bootstrap' );
+		EE::debug( $this->_project_config_path_debug, 'bootstrap' );
+		EE::debug( 'argv: ' . implode( ' ', $GLOBALS['argv'] ), 'bootstrap' );
+
 		$this->init_ee();
 
 		// Enable PHP error reporting to stderr if testing.
 		if ( getenv( 'BEHAT_RUN' ) ) {
 			$this->enable_error_reporting();
 		}
 
-		EE::debug( $this->_global_config_path_debug, 'bootstrap' );
-		EE::debug( $this->_project_config_path_debug, 'bootstrap' );
-		EE::debug( 'argv: ' . implode( ' ', $GLOBALS['argv'] ), 'bootstrap' );
-
 		if ( $this->alias ) {
 			if ( '@all' === $this->alias && ! isset( $this->aliases['@all'] ) ) {
 				EE::error( "Cannot use '@all' when no aliases are registered." );