Merge pull request #63 from lbr38/devel

4.3.0

docker/Dockerfile

@@ -21,13 +21,13 @@ RUN apt-get install findutils iputils-ping git curl ca-certificates apt-transpor
 RUN curl -sS https://packages.bespin.ovh/repo/gpgkeys/packages.bespin.ovh.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/packages.bespin.ovh.gpg
 RUN echo "deb https://packages.bespin.ovh/repo/motion/bookworm/main_prod bookworm main" > /etc/apt/sources.list.d/motion.list
 
-# Add nginx and PHP 8.1 repositories
+# Add nginx and PHP repositories
 RUN echo "deb https://packages.bespin.ovh/repo/motionui-nginx/bookworm/nginx_prod bookworm nginx" > /etc/apt/sources.list.d/nginx.list
 RUN echo "deb https://packages.bespin.ovh/repo/motionui-php/bookworm/main_prod bookworm main" > /etc/apt/sources.list.d/php.list
 RUN apt-get update -y
 
-# Install nginx and PHP 8.1
-RUN apt-get install nginx php8.1-fpm php8.1-cli php8.1-sqlite3 php8.1-xml php8.1-curl sqlite3 -y
+# Install nginx and PHP 8.3
+RUN apt-get install nginx php8.3-fpm php8.3-cli php8.3-sqlite3 php8.3-xml php8.3-curl sqlite3 -y
 
 # Install motion
 RUN apt-get install motion -y
@@ -48,7 +48,7 @@ RUN cp /tmp/motionui/docker/config/nginx/motionui.conf /etc/nginx/sites-enabled/
 RUN rm -rf /etc/nginx/sites-enabled/default /var/www/html
 
 # Configure PHP
-RUN cp /tmp/motionui/docker/config/php/www.conf /etc/php/8.1/fpm/pool.d/www.conf
+RUN cp /tmp/motionui/docker/config/php/www.conf /etc/php/8.3/fpm/pool.d/www.conf
 
 # Configure SQLite
 RUN echo ".headers on" > /root/.sqliterc

docker/config/nginx/motionui.conf

@@ -8,7 +8,7 @@ map $request_uri $loggable {
 
 # Path to unix socket
 upstream php-handler {
-    server unix:/run/php/php8.1-fpm.sock;
+    server unix:/run/php/php8.3-fpm.sock;
 }
 
 server {

docker/config/php/www.conf

@@ -33,7 +33,7 @@ group = www-data
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /run/php/php8.1-fpm.sock
+listen = /run/php/php8.3-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)

docker/entrypoint.sh

@@ -27,7 +27,7 @@ if [ ! -z "$FQDN" ];then
 fi
 
 # Start services
-/usr/sbin/service php8.1-fpm start
+/usr/sbin/service php8.3-fpm start
 /usr/sbin/service nginx start
 /usr/sbin/service postfix start
 

www/controllers/Process.php

@@ -7,7 +7,7 @@
 
 class Process
 {
-    private $workingDir = ROOT . '/.temp'; // Répertoire de travail pour php
+    private $workingDir = ROOT;
     private $command;
     private $env;
     private $process;

www/controllers/Service/Service.php

@@ -380,7 +380,7 @@ private function runService(string $parameter)
             /**
              *  Check if the service with specified parameter is already running (a php process must be running)
              */
-            $myprocess = new \Controllers\Process("ps aux | grep 'motionui." . $parameter . "' | grep -v grep");
+            $myprocess = new \Controllers\Process("/usr/bin/ps aux | grep 'motionui." . $parameter . "' | grep -v grep");
             $myprocess->execute();
             $content = $myprocess->getOutput();
             $myprocess->close();

www/version

@@ -1 +1 @@
-4.2.0
+4.3.0