From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 6 Oct 2023 07:20:10 +0000 (+0200)
Subject: wip #6360 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c9a06f18859a64f7d1b94d8f04021b61d283499f;p=fluidbook-toolbox.git

wip #6360 @0.5
---

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index e9da0a306..2bafcd21d 100644
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -73,11 +73,13 @@ trait DockerWebContainer
                 '$locale' => 'fr_FR',
                 '$localeshort' => 'fr',
                 '$sshpassword' => Str::random(16),
+                '$fixrights' => '',
             ];
 
             if (!$variables['$domain']) {
                 $variables['$domain'] = $name . '.dev.cubedesigners.com';
             }
+            $fixRights = [];
             $variables['$domain'] = $subDomain . $variables['$domain'];
 
             $dir = Files::mkdir($tmp . '/' . $name . $dockerSuffix);
@@ -91,9 +93,11 @@ trait DockerWebContainer
                 if (version_compare($variables['$phpversion'], '7.3', '<=')) {
                     $variables['$phpfpmimage'] = 'php-' . $variables['$phpversion'] . '-fpm';
                 }
+                $fixRights[] = 'chown 0:0 ./config/cron/crontab';
             }
             if ($request->get('mysql', true)) {
                 $compose[] = 'mysql';
+                $fixRights[] = 'chown -R 999:999 ./database/data';
             }
             if ($request->get('redis', true)) {
                 $compose[] = 'redis';
@@ -103,7 +107,11 @@ trait DockerWebContainer
             }
             if ($request->get('elasticsearch', false)) {
                 $compose[] = 'elasticsearch';
+                $fixRights[] = 'chmod -R 777 ./esdata';
             }
+
+            $variables['$fixrights'] = implode("\n", $fixRights);
+
             $compose[] = 'network';
             $composeFileContent = '';
             foreach ($compose as $item) {
diff --git a/resources/tools/dockerwebcontainer/php b/resources/tools/dockerwebcontainer/php
index 40a6810eb..3fca33d5d 100644
--- a/resources/tools/dockerwebcontainer/php
+++ b/resources/tools/dockerwebcontainer/php
@@ -20,6 +20,8 @@
             - './config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml'
             # Passwords
             - './config/passwords:/root/passwords'
+            # Cron
+            - './config/cron/crontab:/etc/crontab'
             # PHP
             - './config/php.ini:/etc/php/$phpversion/fpm/conf.d/99-overrides.ini'
             # Web path
diff --git a/resources/tools/dockerwebcontainer/template/config/php.ini b/resources/tools/dockerwebcontainer/template/config/php.ini
index c0ef7ab55..dba8bcff6 100644
--- a/resources/tools/dockerwebcontainer/template/config/php.ini
+++ b/resources/tools/dockerwebcontainer/template/config/php.ini
@@ -1,5 +1,6 @@
 upload_max_filesize = 8G
 post_max_size = 8G
+max_file_uploads = 1000
 error_log = /proc/self/fd/2
 log_errors = 1
 memory_limit = 12G
diff --git a/resources/tools/dockerwebcontainer/template/update b/resources/tools/dockerwebcontainer/template/update
index 96c0a88fc..86cc0fa5d 100644
--- a/resources/tools/dockerwebcontainer/template/update
+++ b/resources/tools/dockerwebcontainer/template/update
@@ -1,7 +1,11 @@
 #!/bin/sh
 cd /docker/$name
 docker network create $name
+
+$fixrights
+
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
+
 docker compose down
 docker compose up -d