From 1a39dbd1792b7d43ea8826852887bb28956d1224 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 24 Feb 2025 17:47:24 +0100 Subject: [PATCH] #7355 @1 --- .docker/dev/docker-compose.yml | 4 +- .docker/images/php-dev/Dockerfile | 60 ++++++++++----------- app/Models/Base/ToolboxContentTranslate.php | 8 +-- bin/startup.sh | 2 +- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index 82c21116e..40f9467d2 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -59,8 +59,8 @@ services: # Rclone - '/home/toolbox/dev/.docker/config/rclone.conf:/application/.config/rclone/rclone.conf' # PHP - - '/home/toolbox/dev/.docker/config/php/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini' - - '/home/toolbox/dev/.docker/config/php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf' + - '/home/toolbox/dev/.docker/config/php/php.ini:/etc/php/8.4/fpm/conf.d/99-overrides.ini' + - '/home/toolbox/dev/.docker/config/php/fpm.conf:/etc/php/8.4/fpm/pool.d/z-overrides.conf' # ENV - '/home/toolbox/dev/.env.dev:/application/.env' ports: diff --git a/.docker/images/php-dev/Dockerfile b/.docker/images/php-dev/Dockerfile index ffce27b2e..14c7d4030 100644 --- a/.docker/images/php-dev/Dockerfile +++ b/.docker/images/php-dev/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.10.3/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 @@ -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 --break-system-packages RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox diff --git a/app/Models/Base/ToolboxContentTranslate.php b/app/Models/Base/ToolboxContentTranslate.php index 8d0b2b3b3..51f44a982 100644 --- a/app/Models/Base/ToolboxContentTranslate.php +++ b/app/Models/Base/ToolboxContentTranslate.php @@ -20,9 +20,11 @@ class ToolboxContentTranslate extends ToolboxBaseTranslate public function getPaths() { $res = []; - foreach (static::getActiveBranches() as $branch) { - $res['Player - git:' . $branch] = static::$_basePath . '/branches/' . $branch; - $res['Player - local:' . $branch] = static::$_basePath . '/local/' . $branch; + if (method_exists(static::class, 'getActiveBranches')) { + foreach (static::getActiveBranches() as $branch) { + $res['Player - git:' . $branch] = static::$_basePath . '/branches/' . $branch; + $res['Player - local:' . $branch] = static::$_basePath . '/local/' . $branch; + } } return $res; } diff --git a/bin/startup.sh b/bin/startup.sh index d1669d489..25931eb76 100644 --- a/bin/startup.sh +++ b/bin/startup.sh @@ -43,5 +43,5 @@ chown -R root:root /etc/monit && /usr/bin/monit /application/bin/mount.sh & # Launch PHP -/usr/sbin/php-fpm8.2 -O +/usr/sbin/php-fpm8.4 -O -- 2.39.5