From 63e760872b3d646e47ddecadd63be86621e19879 Mon Sep 17 00:00:00 2001
From: f4ilji <F4ilji@yandex.ru>
Date: Sat, 2 Nov 2024 15:46:48 +0500
Subject: [PATCH] Changes

---
 _docker/app/Dockerfile              |  1 +
 _docker/supervisor/Dockerfile       | 21 ---------------------
 _docker/supervisor/supervisord.conf | 12 ++----------
 docker-compose.yml                  | 15 +++++++++++----
 4 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 _docker/supervisor/Dockerfile

diff --git a/_docker/app/Dockerfile b/_docker/app/Dockerfile
index 00c3211..c05abbc 100644
--- a/_docker/app/Dockerfile
+++ b/_docker/app/Dockerfile
@@ -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-install intl
 
+
 # Копирование конфигурационного файла PHP
 COPY ./_docker/app/php.ini /usr/local/etc/php/conf.d/php.ini
 
diff --git a/_docker/supervisor/Dockerfile b/_docker/supervisor/Dockerfile
deleted file mode 100644
index bf85695..0000000
--- a/_docker/supervisor/Dockerfile
+++ /dev/null
@@ -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"]
diff --git a/_docker/supervisor/supervisord.conf b/_docker/supervisor/supervisord.conf
index 6e6f291..2e53d97 100644
--- a/_docker/supervisor/supervisord.conf
+++ b/_docker/supervisor/supervisord.conf
@@ -1,7 +1,7 @@
 [supervisord]
 nodaemon=true
 
-[program:laravel-queue]
+[program:laravel-worker]
 process_name=%(program_name)s_%(process_num)02d
 command=php /var/www/artisan queue:work --sleep=3 --tries=3
 autostart=true
@@ -9,12 +9,4 @@ autorestart=true
 user=www-data
 numprocs=1
 redirect_stderr=true
-stdout_logfile=/var/www/storage/logs/queue.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
+stdout_logfile=/var/www/storage/logs/worker.log
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 76c4a41..818dcae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,11 +20,19 @@ services:
     container_name: ntspi-php
     ports:
       - '5173'
-    depends_on:
-      - db
     command: >
       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:
     image: mysql:8.0
     restart: always
@@ -37,5 +45,4 @@ services:
       - MYSQL_USER=admin
       - MYSQL_PASSWORD=secret
     ports:
-      - "3306:3306"
-
+      - "3306:3306"
\ No newline at end of file