Changes
This commit is contained in:
@@ -28,6 +28,7 @@ RUN apt-get update && apt-get install -y zlib1g-dev libicu-dev g++
|
|||||||
RUN docker-php-ext-configure intl
|
RUN docker-php-ext-configure intl
|
||||||
RUN docker-php-ext-install intl
|
RUN docker-php-ext-install intl
|
||||||
|
|
||||||
|
|
||||||
# Копирование конфигурационного файла PHP
|
# Копирование конфигурационного файла PHP
|
||||||
COPY ./_docker/app/php.ini /usr/local/etc/php/conf.d/php.ini
|
COPY ./_docker/app/php.ini /usr/local/etc/php/conf.d/php.ini
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
FROM php:8.2-fpm
|
|
||||||
|
|
||||||
# Установка Supervisor и необходимых пакетов
|
|
||||||
RUN apt-get update && \
|
|
||||||
apt-get install -y supervisor curl gnupg2 && \
|
|
||||||
curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
|
|
||||||
apt-get install -y nodejs && \
|
|
||||||
apt-get clean && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Копирование конфигурации Supervisor
|
|
||||||
COPY ./_docker/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
|
||||||
|
|
||||||
# Установка рабочего каталога
|
|
||||||
WORKDIR /var/www
|
|
||||||
|
|
||||||
EXPOSE 13714
|
|
||||||
|
|
||||||
|
|
||||||
# Команда для запуска Supervisor
|
|
||||||
CMD ["/usr/bin/supervisord"]
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
[supervisord]
|
[supervisord]
|
||||||
nodaemon=true
|
nodaemon=true
|
||||||
|
|
||||||
[program:laravel-queue]
|
[program:laravel-worker]
|
||||||
process_name=%(program_name)s_%(process_num)02d
|
process_name=%(program_name)s_%(process_num)02d
|
||||||
command=php /var/www/artisan queue:work --sleep=3 --tries=3
|
command=php /var/www/artisan queue:work --sleep=3 --tries=3
|
||||||
autostart=true
|
autostart=true
|
||||||
@@ -9,12 +9,4 @@ autorestart=true
|
|||||||
user=www-data
|
user=www-data
|
||||||
numprocs=1
|
numprocs=1
|
||||||
redirect_stderr=true
|
redirect_stderr=true
|
||||||
stdout_logfile=/var/www/storage/logs/queue.log
|
stdout_logfile=/var/www/storage/logs/worker.log
|
||||||
|
|
||||||
[program:inertia-ssr]
|
|
||||||
command=php /var/www/artisan inertia:start-ssr
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
user=www-data
|
|
||||||
redirect_stderr=true
|
|
||||||
stdout_logfile=/var/www/storage/logs/inertia-ssr.log
|
|
||||||
+11
-4
@@ -20,11 +20,19 @@ services:
|
|||||||
container_name: ntspi-php
|
container_name: ntspi-php
|
||||||
ports:
|
ports:
|
||||||
- '5173'
|
- '5173'
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
command: >
|
command: >
|
||||||
sh -c "php artisan inertia:start-ssr & php-fpm"
|
sh -c "php artisan inertia:start-ssr & php-fpm"
|
||||||
|
|
||||||
|
php-queue:
|
||||||
|
restart: always
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: _docker/app/Dockerfile
|
||||||
|
volumes:
|
||||||
|
- ./:/var/www
|
||||||
|
container_name: ntspi-php-queue
|
||||||
|
command: php artisan queue:work --tries=3 --timeout=90 # Настройте параметры по необходимости
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: mysql:8.0
|
image: mysql:8.0
|
||||||
restart: always
|
restart: always
|
||||||
@@ -37,5 +45,4 @@ services:
|
|||||||
- MYSQL_USER=admin
|
- MYSQL_USER=admin
|
||||||
- MYSQL_PASSWORD=secret
|
- MYSQL_PASSWORD=secret
|
||||||
ports:
|
ports:
|
||||||
- "3306:3306"
|
- "3306:3306"
|
||||||
|
|
||||||
Reference in New Issue
Block a user