Merge pull request #1456 from mrrobot47/update/images

Update PHP, Nginx and Mariadb images

Author: mrrobot47

img-versions.json

@@ -1,15 +1,15 @@
 {
     "easyengine/cron": "v4.0.0",
     "easyengine/mailhog": "v4.0.0",
-    "easyengine/mariadb": "v4.0.0",
+    "easyengine/mariadb": "v4.1.3",
     "easyengine/nginx-proxy": "v4.0.3",
-    "easyengine/nginx": "v4.1.0",
-    "easyengine/php": "v4.1.2",
+    "easyengine/nginx": "v4.1.3",
+    "easyengine/php": "v4.1.3",
     "easyengine/php5.6": "v4.0.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/php7.2": "v4.1.3",
+    "easyengine/php7.3": "v4.1.3",
+    "easyengine/php7.4": "v4.1.3",
     "easyengine/postfix": "v4.0.0",
     "easyengine/redis": "v4.0.0",
     "easyengine/newrelic-daemon": "v4.0.0"

php/EE/Migration/SiteContainers.php

@@ -206,17 +206,31 @@ public static function delete( $path_to_delete ) {
 	/**
 	 * Function to reload site's nginx.
 	 *
-	 * @param string $site_fs_path   Directory containing site's docker-compose.yml.
+	 * @param string $site_fs_path Directory containing site's docker-compose.yml.
 	 */
 	public static function reload_nginx( $site_fs_path ) {
 
 		chdir( $site_fs_path );
-		$success = EE::exec( "docker-compose exec nginx sh -c 'nginx -t && service openresty reload'" );
+		$success = EE::exec( "docker-compose exec nginx sh -c 'nginx -t && nginx -s reload'" );
 		if ( ! $success ) {
 			throw new \Exception( 'Could not reload nginx. Check logs.' );
 		}
 	}
 
+	/**
+	 * Function to reload site's php.
+	 *
+	 * @param string $site_fs_path Directory containing site's docker-compose.yml.
+	 */
+	public static function reload_php( $site_fs_path ) {
+
+		chdir( $site_fs_path );
+		$success = EE::exec( "docker-compose exec php bash -c 'kill -USR2 1'" );
+		if ( ! $success ) {
+			throw new \Exception( 'Could not reload php. Check logs.' );
+		}
+	}
+
 	/**
 	 * Function to pull site docker-compose images.
 	 *