Cx4x/ptb
1
0
Fork 1
Code Issues Pull Requests Actions2 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into dev

Browse Source
This commit is contained in:
guorong.zheng 2025-01-22 15:54:27 +08:00
commit 9126f47e6d
4 changed files with 47 additions and 39 deletions

24
README.md

@ -207,9 +207,9 @@ pipenv run ui
版本运行模式（推荐酒店源、组播源、关键字搜索使用此版本）
- iptv-api:lite（精简版本）：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本）
#### 1. 拉取镜像：
#### 1. 拉取镜像
- iptv-api：
- iptv-api
```bash
docker pull guovern/iptv-api:latest
@ -221,7 +221,7 @@ docker pull guovern/iptv-api:latest
docker pull docker.1ms.run/guovern/iptv-api:latest
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker pull guovern/iptv-api:lite
@ -233,15 +233,15 @@ docker pull guovern/iptv-api:lite
docker pull docker.1ms.run/guovern/iptv-api:lite
```
#### 2. 运行容器：
#### 2. 运行容器
- iptv-api：
- iptv-api
```bash
docker run -d -p 8000:8000 guovern/iptv-api
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker run -d -p 8000:8000 guovern/iptv-api:lite
@ -253,16 +253,18 @@ docker run -d -p 8000:8000 guovern/iptv-api:lite
以宿主机路径/etc/docker 为例：
- iptv-api：
- iptv-api
```bash
docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api
-v /etc/docker/config:/iptv-api/config
-v /etc/docker/output:/iptv-api/output
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite
-v /etc/docker/config:/iptv-api-lite/config
-v /etc/docker/output:/iptv-api-lite/output
```
##### 环境变量：
@ -280,7 +282,7 @@ docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/ip
-e UPDATE_CRON2="0 10 * * *"
```
#### 3. 更新结果：
#### 3. 更新结果
- 接口地址：`ip:8000`
- m3u 接口：`ip:8000/m3u`

16
README_en.md

@ -214,7 +214,7 @@ pipenv run ui
It's recommended to try each one and choose the version that suits you
#### 1. Pull the image:
#### 1. Pull the image
- iptv-api
@ -240,7 +240,7 @@ docker pull guovern/iptv-api:lite
docker pull docker.1ms.run/guovern/iptv-api:lite
```
#### 2. Run the container:
#### 2. Run the container
- iptv-api
@ -261,16 +261,18 @@ and retrieving updated result files can be directly operated in the host machine
Taking the host path /etc/docker as an example:
- iptv-api：
- iptv-api
```bash
docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api
-v /etc/docker/config:/iptv-api/config
-v /etc/docker/output:/iptv-api/output
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite
-v /etc/docker/config:/iptv-api-lite/config
-v /etc/docker/output:/iptv-api-lite/output
```
##### Environment Variables:
@ -288,7 +290,7 @@ docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/ip
-e UPDATE_CRON2="0 10 * * *"
```
#### 3. Update results:
#### 3. Update results
- API address: `ip:8000`
- m3u api：`ip:8000/m3u`

24
docs/tutorial.md

@ -271,9 +271,9 @@ pipenv run ui
版本运行模式（推荐酒店源、组播源、关键字搜索使用此版本）
- `iptv-api:lite`（精简版本）：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本）
### 1.拉取镜像：
### 1. 拉取镜像
- iptv-api：
- iptv-api
```bash
docker pull guovern/iptv-api:latest
@ -285,7 +285,7 @@ docker pull guovern/iptv-api:latest
docker pull docker.1ms.run/guovern/iptv-api:latest
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker pull guovern/iptv-api:lite
@ -297,15 +297,15 @@ docker pull guovern/iptv-api:lite
docker pull docker.1ms.run/guovern/iptv-api:lite
```
### 2.运行容器：
### 2. 运行容器
- iptv-api：
- iptv-api
```bash
docker run -d -p 8000:8000 guovern/iptv-api
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker run -d -p 8000:8000 guovern/iptv-api:lite
@ -317,16 +317,18 @@ docker run -d -p 8000:8000 guovern/iptv-api:lite
以宿主机路径`/etc/docker`为例：
- iptv-api：
- iptv-api
```bash
docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api
-v /etc/docker/config:/iptv-api/config
-v /etc/docker/output:/iptv-api/output
```
- iptv-api:lite：
- iptv-api:lite
```bash
docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite
-v /etc/docker/config:/iptv-api-lite/config
-v /etc/docker/output:/iptv-api-lite/output
```
##### 注意：如果重新拉取镜像进行更新版本后，涉及到配置文件变更或增加新配置时，务必覆盖主机的旧配置文件（config目录），因为主机的配置文件是无法自动更新的，否则容器还是以旧配置运行。
@ -346,7 +348,7 @@ docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/ip
-e UPDATE_CRON2="0 10 * * *"
```
### 3.更新结果：
### 3. 更新结果
- 接口地址：`ip:8000`
- m3u 接口：`ip:8000/m3u`

22
docs/tutorial_en.md

@ -303,9 +303,9 @@ If you do not understand the software configuration options, do not change anyth
- `iptv-api:lite` (lite version): Lightweight, low performance requirements, fast update speed, uncertain stability (
recommended for subscription sources).
### 1. Pull the image:
### 1. Pull the image
- iptv-api:
- iptv-api
```bash
docker pull guovern/iptv-api:latest
@ -329,15 +329,15 @@ docker pull guovern/iptv-api:lite
docker pull docker.1ms.run/guovern/iptv-api:lite
```
### 2. Run the container:
### 2. Run the container
- iptv-api:
- iptv-api
```bash
docker run -d -p 8000:8000 guovern/iptv-api
```
- iptv-api:lite:
- iptv-api:lite
```bash
docker run -d -p 8000:8000 guovern/iptv-api:lite
@ -350,16 +350,18 @@ files directly in the host folder.
Using the host path `/etc/docker` as an example:
- iptv-api:
- iptv-api
```bash
docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api
-v /etc/docker/config:/iptv-api/config
-v /etc/docker/output:/iptv-api/output
```
- iptv-api:lite:
- iptv-api:lite
```bash
docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite
-v /etc/docker/config:/iptv-api-lite/config
-v /etc/docker/output:/iptv-api-lite/output
```
##### Note: If you pull the image again to update the version, and there are changes or additions to the configuration files, be sure to overwrite the old configuration files in the host (config directory), as the host configuration files cannot be updated automatically. Otherwise, the container will still run with the old configuration.
@ -379,7 +381,7 @@ docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/ip
-e UPDATE_CRON2="0 10 * * *"
```
### 3. Update results:
### 3. Update results
```
- API address: `ip:8000`