From 4efe45585f3093bc9b3e50574a60e07a05fdd6fe Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 13 Feb 2023 16:40:49 +0100
Subject: [PATCH] wip #5721 @0.5

---
 .docker/images/php/Dockerfile       | 41 +++++++++++++++--------------
 app/Fluidbook/Packager/Packager.php |  3 ++-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 77773a127..526bf537a 100644
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -23,7 +23,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
         && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C
 
-RUN apt-get update && apt-get -y --no-install-recommends install \
+RUN apt update && apt -y --no-install-recommends install \
         git git-restore-mtime \
         php8.1-fpm \
         php8.1-apcu \
@@ -56,24 +56,25 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 STOPSIGNAL SIGQUIT
 
 # Toolbox
-RUN apt-get -y --no-install-recommends install nodejs google-chrome-stable
-RUN apt-get -y --no-install-recommends install sudo
-RUN apt-get -y --no-install-recommends install supervisor ssh rsync
-RUN apt-get -y --no-install-recommends install default-jre pdftk poppler-utils inkscape mupdf-tools ghostscript imagemagick netpbm libjpeg-turbo8 libjpeg-turbo-progs
-RUN apt-get -y --no-install-recommends install zip unzip gzip 7zip
-RUN apt-get -y --no-install-recommends install icoutils fontforge icnsutils
-RUN apt-get -y --no-install-recommends install ffmpeg python3 lame x264 vorbis-tools
-RUN apt-get -y --no-install-recommends install inkscape mupdf-tools librsvg2-bin
-RUN apt-get -y --no-install-recommends install cron monit locate telnet
-RUN apt-get -y --no-install-recommends install mariadb-client
-RUN apt-get -y --no-install-recommends install build-essential chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev
-RUN apt-get -y --no-install-recommends install libreoffice
-RUN apt-get -y --no-install-recommends install lftp rclone
-RUN apt-get -y --no-install-recommends install sshfs python3 python3-pip
-RUN apt-get -y --no-install-recommends install openssh-server rsyslog
-RUN apt-get -y --no-install-recommends install wine libwine wine64
-
-RUN apt-get -y --no-install-recommends install locales
+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 -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
+RUN apt -y --no-install-recommends install inkscape mupdf-tools librsvg2-bin
+RUN apt -y --no-install-recommends install cron monit locate telnet
+RUN apt -y --no-install-recommends install mariadb-client
+RUN apt -y --no-install-recommends install build-essential chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev
+RUN apt -y --no-install-recommends install libreoffice
+RUN apt -y --no-install-recommends install lftp rclone
+RUN apt -y --no-install-recommends install sshfs python3 python3-pip
+RUN apt -y --no-install-recommends install openssh-server rsyslog
+RUN apt -y --no-install-recommends install wine libwine wine64
+RUN apt -y --no-install-recommends install pdfposter rename
+
+RUN apt -y --no-install-recommends install locales
 RUN sed -i '/fr_FR.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
 ENV LANG fr_FR.UTF-8
@@ -85,7 +86,7 @@ RUN cd /root;wget https://github.com/RazrFalcon/svgcleaner/releases/download/v0.
 
 RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
 
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 RUN npm install --unsafe-perm --global uglify-js less sass puppeteer favicons crx3 nw-builder@^4
diff --git a/app/Fluidbook/Packager/Packager.php b/app/Fluidbook/Packager/Packager.php
index 11f4f808d..f298d5a58 100644
--- a/app/Fluidbook/Packager/Packager.php
+++ b/app/Fluidbook/Packager/Packager.php
@@ -313,7 +313,8 @@ class Packager extends \App\Jobs\Base
 
         if ($this->_ext !== 'html') {
             $e = $this->_ext;
-            `find $dest -type f -name "*.html" -exec rename 's/\.html$/.$e/' '{}' \;`;
+            $cmd = "find $dest -type f -name \"*.html\" -exec rename 's/\.html$/.$e/' '{}' \;";
+            `$cmd`;
         }
     }
 
-- 
2.39.5