From 3a363c4656703ff2b7f87dde34fce09698d7479e Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 8 Dec 2023 08:56:15 +0100 Subject: [PATCH] wip #6433 @0.5 --- .docker/images/php-alpha/Dockerfile | 3 +- .docker/images/php-dev/Dockerfile | 54 ++++++++++++++--------------- .docker/images/php/Dockerfile | 51 +++++++++++++-------------- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.docker/images/php-alpha/Dockerfile b/.docker/images/php-alpha/Dockerfile index b5a7a0221..41ea2d095 100644 --- a/.docker/images/php-alpha/Dockerfile +++ b/.docker/images/php-alpha/Dockerfile @@ -79,6 +79,7 @@ ENV LC_ALL fr_FR.UTF-8 RUN cd /root;wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2;tar xvjf phantomjs-2.1.1-linux-x86_64.tar.bz2;mv phantomjs-2.1.1-linux-x86_64 /usr/local/share;ln -sf /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin RUN cd /root;wget https://github.com/RazrFalcon/svgcleaner/releases/download/v0.9.5/svgcleaner_linux_x86_64_0.9.5.tar.gz; tar xvzf svgcleaner_linux_x86_64_0.9.5.tar.gz;mv svgcleaner /usr/local/bin +RUN cd /root;wget https://github.com/astraw/svg_stack/archive/refs/tags/0.1.0.tar.gz; tar xvzf 0.1.0.tar.gz;mv svg_stack-0.1.0 /usr/local/svg_stack RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && chmod 755 /usr/local/bin/yt-dlp @@ -86,7 +87,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 -RUN pip3 install font-line +RUN pip3 install font-line lxml six RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox diff --git a/.docker/images/php-dev/Dockerfile b/.docker/images/php-dev/Dockerfile index 3d4bcaa0a..41ea2d095 100644 --- a/.docker/images/php-dev/Dockerfile +++ b/.docker/images/php-dev/Dockerfile @@ -13,7 +13,7 @@ RUN apt update && apt -y --no-install-recommends install build-essential scons m RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-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_20.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 \ @@ -21,31 +21,30 @@ RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/ 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.3-fpm \ + php8.3-apcu \ + php8.3-cli \ + php8.3-curl \ + php8.3-mbstring \ + php8.3-opcache \ + php8.3-readline \ + php8.3-xml \ + php8.3-zip \ + php8.3-bz2 \ + php8.3-gd \ + php8.3-igbinary \ + php8.3-imap \ + php8.3-imagick \ + php8.3-intl \ + php8.3-memcached \ + php8.3-mysql \ + php8.3-redis \ + php8.3-soap \ + php8.3-ssh2 \ + php8.3-tidy \ + php8.3-xsl \ + php8.3-curl \ + php8.3-bcmath \ less nano wget bash lynx COPY --from=composer:2 /usr/bin/composer /usr/bin/composer @@ -80,6 +79,7 @@ ENV LC_ALL fr_FR.UTF-8 RUN cd /root;wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2;tar xvjf phantomjs-2.1.1-linux-x86_64.tar.bz2;mv phantomjs-2.1.1-linux-x86_64 /usr/local/share;ln -sf /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin RUN cd /root;wget https://github.com/RazrFalcon/svgcleaner/releases/download/v0.9.5/svgcleaner_linux_x86_64_0.9.5.tar.gz; tar xvzf svgcleaner_linux_x86_64_0.9.5.tar.gz;mv svgcleaner /usr/local/bin +RUN cd /root;wget https://github.com/astraw/svg_stack/archive/refs/tags/0.1.0.tar.gz; tar xvzf 0.1.0.tar.gz;mv svg_stack-0.1.0 /usr/local/svg_stack RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && chmod 755 /usr/local/bin/yt-dlp @@ -87,7 +87,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 -RUN pip3 install font-line +RUN pip3 install font-line lxml six RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile index f3e7d4162..41ea2d095 100644 --- a/.docker/images/php/Dockerfile +++ b/.docker/images/php/Dockerfile @@ -13,7 +13,7 @@ RUN apt update && apt -y --no-install-recommends install build-essential scons m RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-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_20.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 \ @@ -21,31 +21,30 @@ RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/ 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.3-fpm \ + php8.3-apcu \ + php8.3-cli \ + php8.3-curl \ + php8.3-mbstring \ + php8.3-opcache \ + php8.3-readline \ + php8.3-xml \ + php8.3-zip \ + php8.3-bz2 \ + php8.3-gd \ + php8.3-igbinary \ + php8.3-imap \ + php8.3-imagick \ + php8.3-intl \ + php8.3-memcached \ + php8.3-mysql \ + php8.3-redis \ + php8.3-soap \ + php8.3-ssh2 \ + php8.3-tidy \ + php8.3-xsl \ + php8.3-curl \ + php8.3-bcmath \ less nano wget bash lynx COPY --from=composer:2 /usr/bin/composer /usr/bin/composer -- 2.39.5