Merge branch 'develop' for v4.0.16

EasyEngine · Jan 6, 2020 · 65eeb3b · 65eeb3b
2 parents ee390e8 + 59b1d9d
commit 65eeb3b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 19 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.15
+4.0.16
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "easyengine/cron-command": "v1.0.2",
         "easyengine/log-command": "v1.0.1",
         "easyengine/mailhog-command": "v1.0.2",
-        "easyengine/site-command": "v2.4.0",
+        "easyengine/site-command": "v2.4.2",
         "easyengine/site-type-wp": "v1.1.0",
         "easyengine/site-type-php": "v1.1.0",
         "easyengine/service-command": "v1.0.9",

diff --git a/composer.lock b/composer.lock
diff --git a/img-versions.json b/img-versions.json
@@ -4,12 +4,12 @@
     "easyengine/mariadb": "v4.0.0",
     "easyengine/nginx-proxy": "v4.0.3",
     "easyengine/nginx": "v4.1.0",
-    "easyengine/php": "v4.1.0",
+    "easyengine/php": "v4.1.2",
     "easyengine/php5.6": "v4.0.0",
-    "easyengine/php7.0": "v4.1.0",
-    "easyengine/php7.2": "v4.1.0",
-    "easyengine/php7.3": "v4.1.0",
-    "easyengine/php7.4": "v4.1.0",
+    "easyengine/php7.0": "v4.1.2",
+    "easyengine/php7.2": "v4.1.2",
+    "easyengine/php7.3": "v4.1.2",
+    "easyengine/php7.4": "v4.1.2",
     "easyengine/postfix": "v4.0.0",
     "easyengine/redis": "v4.0.0",
     "easyengine/newrelic-daemon": "v4.0.0"

diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php
@@ -81,11 +81,25 @@ public static function save_upgraded_image_versions( $current_versions, $new_ver
 			'EE\Migration\Containers::revert_database_entry',
 			[ $new_versions, $updated_images ],
 			[ $current_versions, $updated_images ]
+		);
 
+		self::$rsp->add_step(
+			'prune-old-docker-images',
+			'EE\Migration\Containers::image_cleanup',
+			null,
+			null,
+			null
 		);
 
 	}
 
+	/**
+	 * Prune old and extra EE Docker images.
+	 */
+	public static function image_cleanup() {
+		EE::exec( 'docker image prune -af --filter=label=org.label-schema.vendor="EasyEngine"' );
+	}
+
 	/**
 	 * Update database entry of images
 	 *