#5294

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index ae8a43c2522091f4b7ba9ae1eca3b168f52ebbf0..8e51a88d67f76b2f15a6d4c896c7f96b21116b0b 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -42,7 +42,9 @@ trait DockerWebContainer
                 '7.4' => '7.4',
                 '8.2' => '8.2',
                 '8.3' => '8.3',
-            ], 'value' => '8.3', 'when' => ['laravel' => 0]]);
+                '8.4' => '8.4',
+                '8.5' => '8.5',
+            ], 'value' => '8.5', 'when' => ['laravel' => 0]]);
         $form->addField('mysql', Checkbox::class, __('Serveur Mariadb') . ' (MySQL)', ['default' => true, 'when' => ['laravel' => '0']]);
         $form->addField('redis', Checkbox::class, __('Serveur Redis'), ['default' => true, 'when' => ['laravel' => '0']]);
         $form->addField('matomo', Checkbox::class, __('Serveur Matomo'), ['default' => false]);
@@ -108,7 +110,7 @@ trait DockerWebContainer
         }
 
         $laravel = $request->get('laravel', 5);
-        $phpversion = $request->get('phpversion', '8.3');
+        $phpversion = $request->get('phpversion', '8.5');
         $mysql = $request->get('mysql', true);
         $redis = $request->get('redis', true);
         $s3 = $request->get('s3', false);

diff --git a/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile b/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
index 78bfdbb3f61c39f4a10b3839cb4d3b3c5639a6a5..13d41f083aa7edbf277ec95b61c9e9f59ff2ee61 100644 (file)
--- a/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
+++ b/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
@@ -24,7 +24,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc
 
 RUN apt update
 
-RUN apt -y --no-install-recommends install \
+RUN apt -y --no-install-recommends --ignore-missing install \
         git \
         php$phpversion-apcu \
         php$phpversion-cli \