wip #5851 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 1ffddc3308747e9487e9d9aaab3b02222c94e302..abf064845d5ede9a3d238993bdff94c84fdeb019 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -10,7 +10,8 @@ services:
       # Files
       - '/home/extranet/share:/application/share'
       - '/home/toolbox/www:/application'
-      - '/home/toolbox/www/storage/app/public/:/application/public/storage/'
+      - '/data/toolbox/storage/app/public/:/application/public/storage/'
+      - '/data/toolbox/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
       - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
@@ -75,7 +76,8 @@ services:
       # Files
       - '/home/extranet/share:/application/share'
       - '/home/toolbox/www:/application'
-      - '/home/toolbox/www/storage/app/public/:/application/public/storage/'
+      - '/data/toolbox/storage/app/public/:/application/public/storage/'
+      - '/data/toolbox/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
       - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 3e902befbc4e7af19cd1fc60431c353654eeb8ea..c1951dd78415af415a6657f0a20d464f564298fa 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -58,7 +58,7 @@ STOPSIGNAL SIGQUIT
 RUN apt -y --no-install-recommends install nodejs google-chrome-stable
 RUN apt -y --no-install-recommends install sudo
 RUN apt -y --no-install-recommends install supervisor ssh rsync
-RUN apt -y --no-install-recommends install default-jre pdftk poppler-utils inkscape mupdf-tools ghostscript imagemagick netpbm libjpeg-turbo8 libjpeg-turbo-progs
+RUN apt update && apt -y --no-install-recommends install default-jre pdftk poppler-utils inkscape mupdf-tools ghostscript imagemagick netpbm libjpeg-turbo8 libjpeg-turbo-progs
 RUN apt -y --no-install-recommends install zip unzip gzip 7zip
 RUN apt -y --no-install-recommends install icoutils fontforge icnsutils
 RUN apt -y --no-install-recommends install ffmpeg python3 lame x264 vorbis-tools