From 1b85c3dd7e1834850c9e7cdbf0dc9d9119d41fff Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 3 Jul 2025 16:29:15 +0200 Subject: [PATCH] #7556 @0.5 --- .docker/images/php/Dockerfile | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile index 69e9c7e34..d7d76a249 100644 --- a/.docker/images/php/Dockerfile +++ b/.docker/images/php/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy AS cli +FROM ubuntu:noble AS cli WORKDIR "/application" @@ -10,42 +10,42 @@ ENV DEBIAN_FRONTEND=noninteractive # Compile NSISbi RUN apt update && apt -y --no-install-recommends install build-essential scons mingw-w64 zlib1g-dev curl unzip ca-certificates wget gnupg -RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.09.1/nsis-code-7405-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7405-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu" +RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.10.3/nsis-code-7423-3-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7423-3-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu" # Add additional repositories -RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - RUN sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - -RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \ +RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ondrej-php.list \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C RUN apt update && apt -y --no-install-recommends install \ git git-restore-mtime \ - php8.2-fpm \ - php8.2-apcu \ - php8.2-cli \ - php8.2-curl \ - php8.2-mbstring \ - php8.2-opcache \ - php8.2-readline \ - php8.2-xml \ - php8.2-zip \ - php8.2-bz2 \ - php8.2-gd \ - php8.2-igbinary \ - php8.2-imap \ - php8.2-imagick \ - php8.2-intl \ - php8.2-memcached \ - php8.2-mysql \ - php8.2-redis \ - php8.2-soap \ - php8.2-ssh2 \ - php8.2-tidy \ - php8.2-xsl \ - php8.2-curl \ - php8.2-mcrypt \ - php8.2-bcmath \ + php8.4-fpm \ + php8.4-apcu \ + php8.4-cli \ + php8.4-curl \ + php8.4-mbstring \ + php8.4-opcache \ + php8.4-readline \ + php8.4-xml \ + php8.4-zip \ + php8.4-bz2 \ + php8.4-gd \ + php8.4-igbinary \ + php8.4-imap \ + php8.4-imagick \ + php8.4-intl \ + php8.4-memcached \ + php8.4-mysql \ + php8.4-redis \ + php8.4-soap \ + php8.4-ssh2 \ + php8.4-tidy \ + php8.4-xsl \ + php8.4-curl \ + php8.4-mcrypt \ + php8.4-bcmath \ less nano wget bash lynx COPY --from=composer:2 /usr/bin/composer /usr/bin/composer @@ -65,7 +65,7 @@ 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 sshfs python3 python3-pip python-is-python3 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 @@ -89,7 +89,7 @@ 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 oslllo-svg-fixer terser npm-check-updates nw-builder@^4 ttf2woff2 -RUN pip3 install font-line lxml six +RUN pip3 install font-line lxml six docling accelerate --break-system-packages RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox -- 2.39.5