Доработка docker-окружения

- перенос конфигов для web в его папку
- префикс m3u-su- возвращён к на iptv-
- уточнения по сборке docs и мелочи по остальным

compose.yml

@@ -1,7 +1,7 @@
-name: m3u-su
+name: iptv
 
 networks:
-  m3u-su-network:
+  iptv-network:
     driver: bridge
 
 x-common-attributes: &common-attributes
@@ -14,12 +14,12 @@ x-common-attributes: &common-attributes
     - /etc/localtime:/etc/localtime:ro
     - /etc/timezone:/etc/timezone:ro
   networks:
-    - m3u-su-network
+    - iptv-network
 
 services:
   nginx:
     <<: *common-attributes
-    container_name: m3u-su-nginx
+    container_name: iptv-nginx
     image: nginx:latest
     pull_policy: always
     volumes:
@@ -27,13 +27,13 @@ services:
       - ./log/nginx:/var/log/nginx:rw
       - ./web:/var/www:ro
     ports:
-      - 8080:80
+      - 3000:80
     depends_on:
       - web
 
   keydb:
     <<: *common-attributes
-    container_name: m3u-su-keydb
+    container_name: iptv-keydb
     image: eqalpha/keydb:latest
     pull_policy: always
     user: ${KEYDB_UID}:${KEYDB_GID}
@@ -47,15 +47,16 @@ services:
 
   web:
     <<: *common-attributes
-    container_name: m3u-su-web
+    container_name: iptv-web
     build:
-      context: .
-      dockerfile: dockerfile.web.${IPTV_ENV}
+      context: ./web
+      dockerfile: Dockerfile
+      target: iptv-web-${IPTV_ENV}
     environment:
-      - PHP_IDE_CONFIG=serverName=m3u-su.local
+      - PHP_IDE_CONFIG=serverName=iptv.local
     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
+      - ./web/docker/${IPTV_ENV}/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
+      - ./web/docker/${IPTV_ENV}/php.ini:/usr/local/etc/php/conf.d/php.ini:ro
       - ./playlists/playlists.ini:/var/www/config/playlists.ini
       - ./log/php:/var/log/php:rw
       - ./web:/var/www:rw
@@ -64,13 +65,15 @@ services:
 
   checker:
     <<: *common-attributes
-    container_name: m3u-su-checker
+    container_name: iptv-checker
     image: git.axenov.dev/iptv/iptvc:latest
-    pull_policy: always
+    build:
+      context: ./iptvc
+      dockerfile: Dockerfile
     command: ["check", "--repeat", "0", "--every", "${CHECKER_WAIT:-60}"]
     environment:
       - CACHE_ENABLED=true
-      - CACHE_HOST=m3u-su-keydb
+      - CACHE_HOST=iptv-keydb
       - CACHE_PORT=${KEYDB_PORT:-6379}
       - CACHE_USERNAME=${KEYDB_USERNAME}
       - CACHE_PASSWORD=${KEYDB_PASSWORD}
@@ -79,11 +82,13 @@ services:
     volumes:
       - ./playlists/playlists.ini:/app/playlists.ini
       - ./playlists/channels.json:/app/channels.json
-    depends_on:
-      - keydb
 
   docs:
     <<: *common-attributes
-    container_name: m3u-su-docs
-    image: git.axenov.dev/iptv/m3u-su-docs:latest
-    pull_policy: always
+    container_name: iptv-docs
+    image: git.axenov.dev/iptv/iptv-docs:latest
+    build:
+      context: ./docs
+      dockerfile: Dockerfile
+    ports:
+      - 3001:80