From c59731d75645d15a10199d09d06c3e6c91e7054b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=82=D0=BE=D0=BB=D0=B8=D0=B9=20=D0=9F?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B7?= Date: Fri, 20 Dec 2024 17:32:55 +0300 Subject: [PATCH] feat(memcached, schedule) --- phpdocker/front-end/Dockerfile | 12 ++++++------ phpdocker/php-fpm/Dockerfile | 18 +++++++++--------- phpdocker/worker/Dockerfile | 7 +++++-- phpdocker/worker/laravel-worker.conf | 14 ++++++++++++++ 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/phpdocker/front-end/Dockerfile b/phpdocker/front-end/Dockerfile index 95fc7c4..181e976 100644 --- a/phpdocker/front-end/Dockerfile +++ b/phpdocker/front-end/Dockerfile @@ -1,14 +1,14 @@ -FROM phpdockerio/php:8.2-fpm +FROM phpdockerio/php:8.3-fpm WORKDIR "/application" -RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_22.x | bash - RUN apt-get update && \ apt-get -y --no-install-recommends install \ git \ - php8.2-gd \ - php8.2-mysql \ - php8.2-sqlite3 \ - php8.2-pgsql \ + php8.3-gd \ + php8.3-mysql \ + php8.3-sqlite3 \ + php8.3-pgsql \ nodejs && npm install -g npm@10.1.0 \ apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index ec5ae24..5696c6f 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -1,18 +1,18 @@ -FROM phpdockerio/php:8.2-fpm +FROM phpdockerio/php:8.3-fpm WORKDIR "/application" -RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_22.x | bash - RUN apt-get update && \ apt-get -y --no-install-recommends install \ git \ - php8.2-gd \ - php8.2-mysql \ - php8.2-sqlite3 \ - php8.2-intl \ - php8.2-pgsql \ + imagemagick php8.3-imagick \ + php8.3-gd \ + php8.3-mysql \ + php8.3-sqlite3 \ + php8.3-intl \ + php8.3-memcached \ + php8.3-pgsql \ python3-pkg-resources supervisor ffmpeg jpegoptim \ - php8.2-intl \ - python3-pkg-resources supervisor \ nodejs && npm install -g npm@10.1.0 \ apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/phpdocker/worker/Dockerfile b/phpdocker/worker/Dockerfile index d1c30cf..df4f50b 100644 --- a/phpdocker/worker/Dockerfile +++ b/phpdocker/worker/Dockerfile @@ -1,9 +1,12 @@ -FROM phpdockerio/php:8.2-fpm +FROM phpdockerio/php:8.3-fpm WORKDIR "/application" RUN apt-get update && \ apt-get -y --no-install-recommends install git \ - php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql ffmpeg jpegoptim \ + php8.3-gd php8.3-mysql php8.3-sqlite3 php8.3-pgsql ffmpeg jpegoptim \ + php8.3-intl \ + php8.3-memcached \ + imagemagick php8.3-imagick \ python3-pkg-resources supervisor && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* diff --git a/phpdocker/worker/laravel-worker.conf b/phpdocker/worker/laravel-worker.conf index cd2a642..3d47d14 100644 --- a/phpdocker/worker/laravel-worker.conf +++ b/phpdocker/worker/laravel-worker.conf @@ -13,3 +13,17 @@ numprocs=2 redirect_stderr=true stdout_logfile=/application/storage/logs/worker.log stopwaitsecs=3600 + +[program:laravel-schedule] +process_name=%(program_name)s_%(process_num)02d +command=php /application/artisan schedule:work +directory=/application +autostart=true +autorestart=true +stopasgroup=true +killasgroup=true +user=www-data +numprocs=1 +redirect_stderr=true +stdout_logfile=/application/storage/logs/schedule.log +stopwaitsecs=3600