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

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

docker/checker/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "CHECKER_WAIT=$CHECKER_WAIT"
+echo "CHECKER_INIFILE=$CHECKER_INIFILE"
+echo "CHECKER_TAGFILE=$CHECKER_TAGFILE"
+
+binary="/app/bin/linux_amd64/iptvc"
+args="check -i $CHECKER_INIFILE -t $CHECKER_TAGFILE"
+
+go get
+make linux
+
+if [ ! -f "$binary" ]; then
+    echo "Not found: $binary"
+    exit 1
+fi
+
+while true; do
+    echo
+    echo "Running: $binary $args"
+    $binary $args
+    echo "Waiting $CHECKER_WAIT seconds"
+    sleep $CHECKER_WAIT
+done

docker/nginx/vhost.conf

@@ -20,7 +20,7 @@ server {
     }
     location ~ \.php$ {
         try_files $uri /index.php =404;
-        fastcgi_pass php:9000;
+        fastcgi_pass web:9000;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

docker/php/dev/dockerfile

@@ -1,21 +0,0 @@
-FROM php:8.3-fpm
-
-RUN apt update && \
-    apt upgrade -y && \
-    apt install -y git unzip 7zip
-
-# https://pecl.php.net/package/xdebug
-# https://pecl.php.net/package/redis
-RUN pecl channel-update pecl.php.net && \
-    pecl install xdebug-3.4.1 redis && \
-    docker-php-ext-enable redis && \
-    mkdir -p /var/run/php && \
-    mkdir -p /var/log/php && \
-    chmod -R 777 /var/log/php
-
-COPY --from=composer /usr/bin/composer /usr/local/bin/composer
-
-EXPOSE 9000
-WORKDIR /var/www
-CMD composer install
-ENTRYPOINT php-fpm

docker/php/dev/php.ini

@@ -1,5 +1,5 @@
 [PHP]
-error_reporting = E_ALL
+error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED
 expose_php = Off
 file_uploads = Off
 max_execution_time=-1

docker/php/dev/www.conf

@@ -19,3 +19,4 @@ 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
+php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_DEPRECATED

docker/php/prod/dockerfile

@@ -1,21 +0,0 @@
-FROM php:8.3-fpm
-
-RUN apt update && \
-    apt upgrade -y && \
-    apt install -y git
-
-# https://pecl.php.net/package/redis
-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 && \
-    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 --no-dev --optimize-autoloader
-ENTRYPOINT php-fpm

docker/php/prod/www.conf

@@ -19,3 +19,4 @@ 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
+php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_DEPRECATED