wip #5418 @1

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 62b8bf577ec0cc1ffe0fa4a3ada5d234ec9780e8..9d5b1b631cedc2c0dd5a3b6f857773727e764094 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -6,6 +6,7 @@ services:
         working_dir: /application
         volumes:
           - '/data1/extranet/toolbox/:/application/'
+          - '/data1/extranet/toolbox/storage/app/public/:/usr/local/apache2/htdocs/storage/'
           - '/data1/extranet/toolbox/public/:/usr/local/apache2/htdocs/'
           - '/data1/extranet/toolbox/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         ports:
@@ -22,8 +23,8 @@ services:
         build: /data1/extranet/toolbox/.docker/images/php
         working_dir: /application
         volumes:
-            - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/:ro'
-            - '/data1/extranet/toolbox/.docker/config/ssh/:/application/.ssh/:ro'
+            - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/'
+            - '/data1/extranet/toolbox/.docker/config/ssh/:/application/.ssh/'
             - '/data1/extranet/toolbox/.docker/config/supervisor/:/etc/supervisor/conf.d/'
             - '/data1/extranet/toolbox/.docker/config/composer/:/root/.config/composer/'
             - '/data1/extranet/toolbox/.docker/config/npm/:/root/.npm/'
@@ -32,11 +33,13 @@ services:
             - '/home/extranet:/home/extranet'
             - '/mnt:/mnt'
             - '/data1/extranet/toolbox:/application'
+            - '/data1/extranet/toolbox/storage/app/public/:/application/public/storage/'
             - '/data1/extranet/toolbox/.docker/config/php.ini:/etc/php/8.1/fpm/conf.d/99-overrides.ini'
             - '/data1/extranet/toolbox/.docker/config/crontab:/etc/crontab'
+            - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/data1/extranet/www/fluidbook/docs/'
         tmpfs:
-          - '/tmp:uid=1001,gid=33'
-          - '/application/storage/framework/cache:uid=1001,gid=33'
+            - '/tmp:uid=1001,gid=33'
+            - '/application/storage/framework/cache:uid=1001,gid=33'
         networks:
           - fluidbook-toolbox
         restart: unless-stopped

diff --git a/.docker/images/php/startup b/.docker/images/php/startup
index d2ec4553172ef1bb7baf9382cfd0840c4a48ffbb..a47e88309028c392e39fdde5e1506fa45e2c8b80 100644 (file)
--- a/.docker/images/php/startup
+++ b/.docker/images/php/startup
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 chmod 0644 /etc/crontab && crontab -u root /etc/crontab
+chown -R toolbox:www-data /application/storage/framework
 /usr/sbin/service cron start
 /usr/sbin/service supervisor start
 /usr/sbin/php-fpm8.1 -O

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index e3f27b9f4d9e7aa1a64f179cecda76f7a4ab345b..d4899d74b0c59f685cf339122400984d80462e13 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -206,7 +206,8 @@ class FluidbookPublication extends ToolboxSettingsModel
             $resolution .= '-' . $q;
         }
         $compo = $this->composition[$page];
-        return self::_getDocument($compo[0])->getFile($compo[1], $format, $resolution, $withText, $withGraphics, $version, $force);
+        $res = self::_getDocument($compo[0])->getFile($compo[1], $format, $resolution, $withText, $withGraphics, $version, $force);
+        return $res;
     }
 
     public function addWidgets()