From b6ce342007c8bff5d49df6724e8bc69e573da43d Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 6 Apr 2023 12:18:31 +0200 Subject: [PATCH] wip #5851 @0.5 --- .docker/docker-compose.yml | 6 ++++-- .docker/images/php/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 1ffddc330..abf064845 100644 --- 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 3e902befb..c1951dd78 100644 --- 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 -- 2.39.5