Merge branch '5534-add-docker' into 'master'

update: remove php-fpm

See merge request !21

public_html/webservice/getfile.php

@@ -13,7 +13,7 @@ if (array_key_exists("ajax", $_GET)) {
 
     $sProcesses = "<h2 class=\"warning\">please wait ...</h2>"
             . shell_exec("uptime") . "<br><pre>"
-            . shell_exec("ps -f --forest | egrep -v '/(apache|httpd|php\-fpm)' | fgrep -v 'ps -f' | fgrep -v grep")
+            . shell_exec("ps -f --forest | egrep -v '(/apache|/httpd|php-fpm)' | fgrep -v 'ps -f' | fgrep -v grep")
             . "</pre>";
 
     $sOut = file_exists($sTmpFile) ? file_get_contents($sTmpFile) : "waiting for " . $sTmpFile;