Разделение конфигов php, мелочи по compose.yml

compose.yml

@@ -2,63 +2,57 @@ networks:
   iptv:
     driver: bridge
 
+x-common-attributes: &common-attributes
+  restart: unless-stopped
+  env_file:
+    - .env
+  extra_hosts:
+    - host.docker.internal:host-gateway
+  volumes:
+    - /etc/localtime:/etc/localtime:ro
+    - /etc/timezone:/etc/timezone:ro
+  networks:
+    - iptv
+
 services:
 
   keydb:
+    <<: *common-attributes
     container_name: iptv-keydb
     image: eqalpha/keydb:latest
     user: "${REDIS_UID}:${REDIS_GID}"
-    restart: unless-stopped
     volumes:
-      - /etc/localtime:/etc/localtime:ro
       - ./docker/keydb/keydb.conf:/etc/keydb/keydb.conf
       - ./docker/keydb/data/:/data:rw
       - ./log/keydb:/var/log/keydb/:rw
-    env_file:
-      - .env
     ports:
       - "${REDIS_PORT:-6379}:6379"
-    networks:
-      - iptv
 
   php:
+    <<: *common-attributes
     container_name: iptv-php
-    env_file:
-      - .env
     environment:
       - PHP_IDE_CONFIG=serverName=iptv.local
     build:
-      dockerfile: docker/php/${IPTV_ENV}.dockerfile
+      dockerfile: docker/php/${IPTV_ENV}/dockerfile
-    restart: unless-stopped
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    networks:
-      - iptv
     volumes:
-      - /etc/localtime:/etc/localtime:ro
+      - ./docker/php/${IPTV_ENV}/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
-      - ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
+      - ./docker/php/${IPTV_ENV}/php.ini:/usr/local/etc/php/conf.d/php.ini:ro
-      - ./docker/php/${IPTV_ENV}.php.ini:/usr/local/etc/php/conf.d/php.ini:ro
       - ./log/php:/var/log/php:rw
-      - ./src:/var/www:rw
+      - ./svc-main:/var/www:rw
-      - ./playlists.ini:/var/www/config/playlists.ini:ro
     depends_on:
       - keydb
 
   nginx:
+    <<: *common-attributes
     container_name: iptv-nginx
     image: nginx:latest
-    restart: unless-stopped
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    networks:
-      - iptv
     volumes:
-      - /etc/localtime:/etc/localtime:ro
       - ./docker/nginx/vhost.conf:/etc/nginx/conf.d/default.conf:ro
       - ./log/nginx:/var/log/nginx:rw
-      - ./src:/var/www:ro
+      - ./svc-main:/var/www:ro
     ports:
-      - '8080:80'
+      - "8080:80"
     links:
       - php
     depends_on:

docker/php/dev/php.ini

@@ -3,6 +3,7 @@ error_reporting = E_ALL
 expose_php = Off
 file_uploads = Off
 max_execution_time=-1
+memory_limit = 512M
 
 [opcache]
 opcache.enable = 1

docker/php/prod/dockerfile

@@ -9,12 +9,13 @@ RUN pecl channel-update pecl.php.net && \
     pecl install redis && \
     docker-php-ext-enable redis && \
     mkdir -p /var/log/php && \
-    chmod -R 777 /var/log/php
+    chmod -R 777 /var/log/php && \
+    git config --global --add safe.directory /var/www
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
 USER www-data
 EXPOSE 9000
 WORKDIR /var/www
-CMD composer install
+CMD composer install --no-dev --optimize-autoloader
 ENTRYPOINT php-fpm

docker/php/prod/php.ini

@@ -2,6 +2,7 @@
 error_reporting = E_ALL
 expose_php = Off
 file_uploads = Off
+memory_limit = 512M
 ; upload_max_filesize=10M
 ; post_max_size=10M
 

docker/php/prod/www.conf

@@ -0,0 +1,21 @@
+[www]
+user = www-data
+group = www-data
+listen = 127.0.0.1:9000
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+pm.max_requests = 50
+pm.status_path = /status
+ping.path = /ping
+ping.response = pong
+access.log = /var/log/php/$pool.access.log
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
+; chroot = /var/www
+; chdir = /var/www
+php_flag[display_errors] = on
+php_admin_value[error_log] = /var/log/php/$pool.error.log
+php_admin_flag[log_errors] = on
+php_admin_value[memory_limit] = 512M