Merge pull request 'supervisord added for laravel queue' (#13) from apoloz/eatvio-infra:main into main

Reviewed-on: eatvio/eatvio-infra#13

docker-compose.yml

@@ -1,8 +1,8 @@
 ---
-version: '3.1'
+version: "3.1"
 services:
   soketi:
-        image: 'quay.io/soketi/soketi:latest-16-alpine'
+    image: "quay.io/soketi/soketi:latest-16-alpine"
     environment:
       SOKETI_DEBUG: ${SOKETI_DEBUG}
       SOKETI_METRICS_SERVER_PORT: ${SOKETI_METRICS_SERVER_PORT}
@@ -12,8 +12,8 @@ services:
       SOKETI_DEFAULT_APP_ENABLE_CLIENT_MESSAGES: ${SOKETI_DEFAULT_APP_ENABLE_CLIENT_MESSAGES}
       SOKETI_DEFAULT_APP_USER_AUTHENTICATION: ${SOKETI_DEFAULT_APP_USER_AUTHENTICATION}
     ports:
-            - '${SOKETI_PORT:-6001}:6001'
-            - '${SOKETI_METRICS_SERVER_PORT:-9601}:9601'
+      - "${SOKETI_PORT:-6001}:6001"
+      - "${SOKETI_METRICS_SERVER_PORT:-9601}:9601"
     networks:
       ns-eatvio:
         ipv4_address: 172.118.0.5
@@ -22,21 +22,21 @@ services:
     restart: always
 
   mysql:
-        image: 'mysql:8.0'
+    image: "mysql:8.0"
     working_dir: /application
     networks:
       ns-eatvio:
         ipv4_address: 172.118.0.3
     volumes:
-            - '.:/application'
-            - './mysql_data:/var/lib/mysql'
+      - ".:/application"
+      - "./mysql_data:/var/lib/mysql"
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
     ports:
-            - '1094:3306'
+      - "1094:3306"
     labels:
       - "traefik.enable=false"
     restart: always
@@ -44,24 +44,34 @@ services:
   php-fpm:
     build: phpdocker/php-fpm
     working_dir: /application
+    environment:
+      - TZ=Europe/Moscow
+    command: ["/usr/bin/supervisord"]
+    depends_on:
+      - mysql
     networks:
       ns-eatvio:
         ipv4_address: 172.118.0.2
     volumes:
-            - './app:/application'
-            - './phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
+      - "./app:/application"
+      - "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini"
+      - "./phpdocker/php-fpm/laravel-worker.conf:/etc/supervisor/conf.d/laravel-worker.conf"
     labels:
       - "traefik.enable=false"
     restart: always
+
   webserver:
-        image: 'nginx:alpine'
+    image: "nginx:alpine"
     working_dir: /application
     restart: always
+    depends_on:
+      - php-fpm
+      - soketi
     volumes:
-            - './app:/application'
-            - './phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf'
+      - "./app:/application"
+      - "./phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf"
     ports:
-            - '1092:80'
+      - "1092:80"
     networks:
       - web
       - ns-eatvio
@@ -73,9 +83,9 @@ services:
       - "traefik.protocol=http"
 
   mailhog:
-      image: 'mailhog/mailhog'
+    image: "mailhog/mailhog"
     ports:
-        - '8082:8025'
+      - "8082:8025"
     networks:
       ns-eatvio:
         ipv4_address: 172.118.0.4

phpdocker/php-fpm/Dockerfile

@@ -2,14 +2,15 @@ FROM phpdockerio/php:8.2-fpm
 WORKDIR "/application"
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
-RUN apt-get update; \
+RUN apt-get update && \
   apt-get -y --no-install-recommends install \
   git \
   php8.2-gd \
   php8.2-mysql \
   php8.2-sqlite3 \
-        nodejs \
-        php8.2-pgsql && npm install -g npm@10.1.0 \
+  php8.2-pgsql \
+  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/*
 

phpdocker/php-fpm/laravel-worker.conf

@@ -0,0 +1,23 @@
+[supervisord]
+nodaemon=true
+
+[program:laravel-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=php /application/artisan queue:work --sleep=3 --tries=3 --max-time=3600
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=www-data
+numprocs=4
+redirect_stderr=true
+stdout_logfile=/application/storage/logs/worker.log
+stopwaitsecs=3600
+
+[program:php-fpm]
+command=php-fpm8.2 -F
+process_name=%(program_name)s_%(process_num)02d
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stdderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0