Внедрение документации

compose.yml

@@ -20,13 +20,13 @@ services:
     <<: *common-attributes
     container_name: iptv-keydb
     image: eqalpha/keydb:latest
-    user: "${KEYDB_UID}:${KEYDB_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:
-      - "${KEYDB_PORT:-6379}:6379"
+      - ${KEYDB_PORT:-6379}:6379
 
   web:
     <<: *common-attributes
@@ -39,7 +39,6 @@ services:
       - ./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
       - ./web:/var/www:rw
     depends_on:
@@ -78,8 +77,9 @@ services:
       - ./docker/nginx/vhost.conf:/etc/nginx/conf.d/default.conf:ro
       - ./log/nginx:/var/log/nginx:rw
       - ./web:/var/www:ro
+      - ./docs/site:/usr/share/nginx/html/doc-files:ro
     ports:
-      - "8080:80"
+      - 8080:80
     links:
       - web
     depends_on:

docker/checker/entrypoint.sh

@@ -3,18 +3,24 @@
 echo "CHECKER_WAIT=$CHECKER_WAIT"
 echo "CHECKER_INIFILE=$CHECKER_INIFILE"
 echo "CHECKER_TAGFILE=$CHECKER_TAGFILE"
+binary="$PWD/bin/iptvc"
 
-binary="/app/bin/linux_amd64/iptvc"
+if [ ! -f "$binary" ]; then
-args="check -i $CHECKER_INIFILE -t $CHECKER_TAGFILE"
+    echo "Downloading latest iptvc..."
-
+    wget https://git.axenov.dev/IPTV/iptvc/releases/download/latest/linux_amd64.zip
-go get
+    [ ! -d "$PWD/bin" ] && mkdir "$PWD/bin"
-make linux
+    unzip -o linux_amd64.zip -d "$PWD/bin"
+    rm -rf linux_amd64.zip
+fi
 
 if [ ! -f "$binary" ]; then
     echo "Not found: $binary"
     exit 1
 fi
 
+$binary version
+
+args="check -i $CHECKER_INIFILE -t $CHECKER_TAGFILE"
 while true; do
     echo
     echo "Running: $binary $args"

docker/nginx/vhost.conf

@@ -1,8 +1,14 @@
 server {
     server_name iptv.local;
     listen 80;
-    root /var/www/public;
+    index index.html index.php;
-    index index.php;
+    # access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log warn;
+    add_header Access-Control-Allow-Origin '*';
+    add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+    add_header Access-Control-Allow-Headers "*";
+    add_header Access-Control-Allow-Credentials "true";
+
     gzip on;
     gzip_vary on;
     gzip_proxied any;
@@ -10,15 +16,29 @@ server {
     gzip_buffers 16 8k;
     gzip_http_version 1.1;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-    location ~* \.(jpg|jpeg|gif|css|png|js|ico|html)$ {
+
-        access_log off;
+    location = /docs {
-        expires max;
+        return 301 /docs/;
-        log_not_found off;
     }
+
+    location ^~ /docs/ {
+        alias /usr/share/nginx/html/doc-files/;
+        index index.html;
+        # access_log /var/log/nginx/docs_access.log;
+        error_log /var/log/nginx/docs_error.log warn;
+        location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg)$ {
+            expires 1y;
+            add_header Cache-Control "public";
+        }
+    }
+
     location / {
+        root /var/www/public;
         try_files $uri $uri/ /index.php$is_args$args;
     }
+
     location ~ \.php$ {
+        root /var/www/public;
         try_files $uri /index.php =404;
         fastcgi_pass web:9000;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
@@ -29,5 +49,17 @@ server {
         fastcgi_read_timeout 300;
         proxy_read_timeout 300;
         include fastcgi_params;
+        location ~* \.(jpg|jpeg|gif|css|png|ttf|woff|svg|js|ico)$ {
+            access_log off;
+            expires max;
+            log_not_found off;
+        }
+    }
+
+    location ~* \.(jpg|jpeg|gif|css|png|ttf|woff|svg|js|ico)$ {
+        root /var/www/public;
+        access_log off;
+        expires max;
+        log_not_found off;
     }
 }

dockerfile.checker

@@ -4,7 +4,8 @@ RUN apk --no-cache add \
     bash \
     tzdata \
     go \
-    make
+    make \
+    libc6-compat
 
 RUN mkdir /app && \
     chmod 777 /app

dockerfile.web.prod

@@ -29,6 +29,6 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 RUN git config --global --add safe.directory /var/www
 
 EXPOSE 9000
-WORKDIR /var/www
+WORKDIR /var/www/
-RUN composer install
+CMD composer install && \
-ENTRYPOINT php-fpm --nodaemonize
+    php-fpm --nodaemonize

iptv

@@ -21,7 +21,7 @@ else
     ROOT_PATH="$(pwd)"
 fi
 
-IPTV_PROJECTS=("iptvc" "web" "playlists")
+IPTV_PROJECTS=("iptvc" "docs" "web" "playlists")
 IPTV_GITEA_URL_SSH="git@git.axenov.dev:IPTV"
 IPTV_GITEA_URL_HTTPS="https://git.axenov.dev/IPTV"
 IPTV_DOCKER_URL_SSH="$IPTV_GITEA_URL_SSH/iptv-docker.git"
@@ -362,12 +362,12 @@ docker.exec_www() {
 
 # Возвращает ssh-адрес к репозиторию проекта
 project_url_ssh() {
-    echo "$IPTV_GITEA_URL_SSH/${IPTV_PROJECTS[$1]}.git"
+    echo "$IPTV_GITEA_URL_SSH/$1.git"
 }
 
 # Возвращает https-адрес к репозиторию проекта
 project_url_https() {
-    echo "$IPTV_GITEA_URL_HTTPS/${IPTV_PROJECTS[$1]}"
+    echo "$IPTV_GITEA_URL_HTTPS/$1"
 }
 
 # Копирует .env.example в .env, если возможно
@@ -416,8 +416,8 @@ find_service_compose() {
 
     for known in $(docker.compose config --services); do
         if [ "$known" = "$svc" ]; then
-            debug "Сервис '$svc' найден в композе"
+            debug "Сервис '$known' найден в композе"
-            echo "iptv-$known"
+            echo "$known"
             exit
         fi
     done
@@ -432,9 +432,8 @@ find_services_compose() {
 
     [ "$*" ] && for svc in "$@"; do
         grep_match "$svc" "^--?.*" && continue
-        var_dump svc
         svc="$(find_service_compose "$svc")"
-        services="$services iptv-$svc"
+        services="$services $svc"
     done
 
     trim "$services"