Merge branch 'develop' for v4.7.1

README.md

@@ -1,12 +1,12 @@
 
 <img src="https://i2.wp.com/easyengine.io/wp-content/uploads/sites/20/2019/06/EasyEngine-New-Logo-Banner@2x-Transparent-Background.png?fit=720%2C170&ssl=1" alt="EasyEngine Logo" />
 
-# EasyEngine v4 [![Build 🔨 + Test 👨‍🔧](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml/badge.svg?branch=develop)](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/) [![Latest Stable Version](https://poser.pugx.org/easyengine/easyengine/v/stable)](https://github.com/EasyEngine/easyengine/releases) [![License](https://poser.pugx.org/easyengine/easyengine/license)](https://packagist.org/packages/easyengine/easyengine)
+# EasyEngine v4
+[![Build 🔨 + Test 👨‍🔧](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml/badge.svg?branch=develop)](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml) 
+[![Latest Stable Version](https://poser.pugx.org/easyengine/easyengine/v/stable)](https://github.com/EasyEngine/easyengine/releases) [![License](https://poser.pugx.org/easyengine/easyengine/license)](https://packagist.org/packages/easyengine/easyengine)
 
 EasyEngine makes it greatly easy to manage nginx, a fast web-server software that consumes little memory when handling increasing volumes of concurrent users.
 
-<a href="https://rtcamp.com/?utm_source=github&utm_medium=readme" rel="nofollow"><img src="https://rtcamp.com/wp-content/uploads/2019/04/github-banner@2x.png" alt="Handcrafted Enterprise WordPress Solutions by rtCamp" /></a>
-
 ## Requirements
 
 * Docker
@@ -65,7 +65,7 @@ ee site create example.com --type=wp --cache
 
 Need a wordpress multi-site with page cache?
 ```
-ee site create example.com --type=wp --mu=wpsubdir --cache
+ee site create example.com --type=wp --mu=subdir --cache
 ```
 
 Need a plain and simple html site?
@@ -84,7 +84,7 @@ Want to know more? Checkout readme of these commands -
  * [cron command](https://github.com/EasyEngine/cron-command/)
  * [shell command](https://github.com/EasyEngine/shell-command/)
 
-Note: :warning: EasyEngine will currently only run with root privileges. You can run `ee help`, `ee help site` and `ee help site create` to get all the details about the various commands and subcommands that you can run.
+Note: :warning: EasyEngine will currently only run with root privileges. You can run `ee help`, `ee help site` and `ee help site create --type=wp` to get all the details about the various commands and subcommands that you can run.
 
 ## Development
 
@@ -110,4 +110,6 @@ We warmheartedly welcome all contributions however and in whatever capacity you
 
 [![PayPal-Donate](https://cloud.githubusercontent.com/assets/4115/5297691/c7b50292-7bd7-11e4-987b-2dc21069e756.png)](http://rt.cx/eedonate)
 
+## Does this interest you?
 
+<a href="https://rtcamp.com/?utm_source=github&utm_medium=readme" rel="nofollow"><img src="https://rtcamp.com/wp-content/uploads/sites/2/2019/04/github-banner@2x.png" alt="Handcrafted Enterprise WordPress Solutions by rtCamp" /></a>

VERSION

@@ -1 +1 @@
-4.7.0
+4.7.1

composer.json

@@ -25,16 +25,16 @@
  "prefer-stable": true,
  "require": {
  "php": ">=7.0",
- "composer/composer": "2.2.12",
+ "composer/composer": "2.2.23",
  "composer/semver": "3.2.4",
  "daverandom/libdns": "^2.0",
  "easyengine/admin-tools-command": "v1.1.0",
  "easyengine/auth-command": "v1.2.0",
  "easyengine/config-command": "v1.0.2",
- "easyengine/cron-command": "v2.0.2",
+ "easyengine/cron-command": "v2.1.0",
  "easyengine/log-command": "v1.1.0",
  "easyengine/mailhog-command": "v1.0.3",
- "easyengine/service-command": "v1.6.0",
+ "easyengine/service-command": "v1.6.1",
  "easyengine/shell-command": "v1.1.1",
  "easyengine/site-command": "v3.3.0",
  "easyengine/site-type-php": "v1.8.0",

img-versions.json

@@ -2,18 +2,18 @@
  "easyengine/cron": "v4.7.0",
  "easyengine/mailhog": "v4.6.5",
  "easyengine/mariadb": "v4.6.6",
- "easyengine/nginx-proxy": "v4.7.0",
- "easyengine/nginx": "v4.7.0",
+ "easyengine/nginx-proxy": "v4.7.1",
+ "easyengine/nginx": "v4.7.1",
  "easyengine/php": "v4.6.6",
  "easyengine/php5.6": "v4.6.6",
  "easyengine/php7.0": "v4.6.6",
  "easyengine/php7.2": "v4.6.6",
  "easyengine/php7.3": "v4.6.6",
  "easyengine/php7.4": "v4.7.0",
- "easyengine/php8.0": "v4.7.0",
- "easyengine/php8.1": "v4.7.0",
- "easyengine/php8.2": "v4.7.0",
- "easyengine/php8.3": "v4.7.0",
+ "easyengine/php8.0": "v4.7.1",
+ "easyengine/php8.1": "v4.7.1",
+ "easyengine/php8.2": "v4.7.1",
+ "easyengine/php8.3": "v4.7.1",
  "easyengine/postfix": "v4.7.0",
  "easyengine/redis": "v4.7.0",
  "easyengine/newrelic-daemon": "v4.7.0"

php/EE/Migration/Containers.php

@@ -128,9 +128,8 @@ public static function image_cleanup() {
  */
  public static function update_docker_compose() {
 
- $docker_compose_version = 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_version = trim( EE::launch( 'docker-compose version --short' )->stdout );
+ $docker_compose_path = trim( EE::launch( 'command -v docker-compose' )->stdout );
  $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup';
  $docker_compose_new_path = EE_BACKUP_DIR . '/docker-compose';
 

php/EE/Migration/SiteContainers.php

@@ -70,13 +70,19 @@ public static function revert_site_docker_compose_file( $source_path, $destinati
  * @return bool
  */
  public static function is_site_service_image_changed( $updated_images, $site_info ) {
+
  chdir( $site_info['site_fs_path'] );
- $launch = EE::launch( 'docker-compose config --services' );
- $services = explode( PHP_EOL, trim( $launch->stdout ) );
+ $launch = EE::launch( 'docker-compose images' );
+ $lines = explode( PHP_EOL, trim( $launch->stdout ) );
+ $site_images = [];
+
+ for ( $i = 1; $i < count( $lines ); $i ++ ) {
+ $columns = preg_split( '/\s+/', $lines[ $i ] );
 
- $site_images = array_map( function ( $service ) {
- return 'easyengine/' . $service;
- }, $services );
+ if ( isset( $columns[1] ) ) {
+ $site_images[] = $columns[1];
+ }
+ }
 
  $common_image = array_intersect( $updated_images, $site_images );
 

php/EE/Runner.php

@@ -133,12 +133,15 @@ public function check_requirements( $show_error = true ) {
  * Function to run migrations required to upgrade to the newer version. Will always be invoked from the newer phar downloaded inside the /tmp folder
  */
  private function migrate() {
+
  $rsp = new \EE\RevertableStepProcessor();
 
  $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' );
+ $rsp->add_step( 'ee-update-cron-config', 'EE\Cron\Utils\update_cron_config' );
+
  return $rsp->execute();
  }