Большая переработка

- внедрён iptvc
- скорректированы докерфайлы
- php8.3 => 8.4
- переписан скрипт iptv
- скорректирован композ и енвы

compose.yml

@@ -20,26 +20,53 @@ services:
     <<: *common-attributes
     container_name: iptv-keydb
     image: eqalpha/keydb:latest
-    user: "${REDIS_UID}:${REDIS_GID}"
+    user: "${KEYDB_UID}:${KEYDB_GID}"
     volumes:
       - ./docker/keydb/keydb.conf:/etc/keydb/keydb.conf
       - ./docker/keydb/data/:/data:rw
       - ./log/keydb:/var/log/keydb/:rw
     ports:
-      - "${REDIS_PORT:-6379}:6379"
+      - "${KEYDB_PORT:-6379}:6379"
 
-  php:
+  web:
     <<: *common-attributes
-    container_name: iptv-php
+    container_name: iptv-web
+    build:
+      dockerfile: dockerfile.web.${IPTV_ENV}
     environment:
       - PHP_IDE_CONFIG=serverName=iptv.local
-    build:
-      dockerfile: docker/php/${IPTV_ENV}/dockerfile
     volumes:
       - ./docker/php/${IPTV_ENV}/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
+      - ./playlists/playlists.ini:/var/www/config/playlists.ini
+      # - ./playlists/channels.json:/var/www/config/channels.json
       - ./log/php:/var/log/php:rw
-      - ./svc-main:/var/www:rw
+      - ./web:/var/www:rw
+    depends_on:
+      - keydb
+
+  checker:
+    <<: *common-attributes
+    container_name: iptv-checker
+    build:
+      dockerfile: ./dockerfile.checker
+    environment:
+      - CACHE_ENABLED=true
+      # - CACHE_HOST=localhost
+      - CACHE_HOST=iptv-keydb
+      - CACHE_PORT=${KEYDB_PORT:-6379}
+      - CACHE_USERNAME=${KEYDB_USERNAME}
+      - CACHE_PASSWORD=${KEYDB_PASSWORD}
+      - CACHE_DB=${CHECKER_DB:-0}
+      - CACHE_TTL=${CHECKER_TTL:-1800}
+      - CHECKER_WAIT=${CHECKER_WAIT:-60}
+      - CHECKER_INIFILE=${CHECKER_INIFILE:-/app/playlists.ini}
+      - CHECKER_TAGFILE=${CHECKER_TAGFILE:-/app/channels.json}
+    volumes:
+      - ./docker/checker/entrypoint.sh:/entrypoint.sh
+      - ./iptvc/:/app/
+      - ./playlists/playlists.ini:${CHECKER_INIFILE:-/app/playlists.ini}
+      - ./playlists/channels.json:${CHECKER_TAGFILE:-/app/channels.json}
     depends_on:
       - keydb
 
@@ -50,10 +77,10 @@ services:
     volumes:
       - ./docker/nginx/vhost.conf:/etc/nginx/conf.d/default.conf:ro
       - ./log/nginx:/var/log/nginx:rw
-      - ./svc-main:/var/www:ro
+      - ./web:/var/www:ro
     ports:
       - "8080:80"
     links:
-      - php
+      - web
     depends_on:
-      - php
+      - web