diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index ab3f37a..2425dbc 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -48,11 +48,11 @@ jobs: with: node-version: 18 - - name: Checkout iptv-checker-web + - name: Checkout iptv-checker-ui-interface uses: actions/checkout@v4 with: - repository: zhimin-dev/iptv-checker-web - path: iptv-checker-web + repository: zhimin-dev/iptv-checker-ui-interface + path: iptv-checker-ui-interface - name: install Rust stable uses: actions-rs/toolchain@v1 @@ -70,7 +70,7 @@ jobs: sudo apt-get install -y webkit2gtk-4.0 - name: install app dependencies and build it - working-directory: ./iptv-checker-web + working-directory: ./iptv-checker-ui-interface run: yarn && yarn build - uses: tauri-apps/tauri-action@v0 @@ -81,7 +81,7 @@ jobs: - name: Build archive shell: bash - working-directory: ./iptv-checker-web + working-directory: ./iptv-checker-ui-interface run: | binaryName="iptv-checker-desktop" gitTagName="${{github.ref_name}}" @@ -134,4 +134,4 @@ jobs: uses: softprops/action-gh-release@v1 with: files: | - ./iptv-checker-web/${{ env.ASSET }} + ./iptv-checker-ui-interface/${{ env.ASSET }} diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 0b5cf0c..90975e8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -30,7 +30,7 @@ jobs: echo ::set-output name=tags::${TAGS} mkdir iptv-checker && cp dockerfile iptv-checker/dockerfile git clone https://github.com/zhimin-dev/iptv-checker-rs.git - git clone https://github.com/zhimin-dev/iptv-checker-web.git + git clone https://github.com/zhimin-dev/iptv-checker-ui-interface.git - name: Setup Docker Buildx Command id: buildx diff --git a/.github/workflows/docker-packages.yml b/.github/workflows/docker-packages.yml index cd5dc23..0bb39fa 100644 --- a/.github/workflows/docker-packages.yml +++ b/.github/workflows/docker-packages.yml @@ -31,7 +31,7 @@ jobs: echo ::set-output name=tags::${TAGS} mkdir iptv-checker && cp dockerfile iptv-checker/dockerfile git clone https://github.com/zhimin-dev/iptv-checker-rs.git - git clone https://github.com/zhimin-dev/iptv-checker-web.git + git clone https://github.com/zhimin-dev/iptv-checker-ui-interface.git - name: Setup Docker Buildx Command id: buildx diff --git a/Makefile b/Makefile index 6929927..6e2ca42 100644 --- a/Makefile +++ b/Makefile @@ -4,4 +4,4 @@ all: migrate migrate: rm -rf ../iptv-checker-rs/web/ - cp -rf ../iptv-checker-web/dist/ ../iptv-checker-rs/web/ \ No newline at end of file + cp -rf ../iptv-checker-ui-interface/dist/ ../iptv-checker-rs/web/ \ No newline at end of file diff --git a/README.md b/README.md index 45e60fa..96e85e1 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,16 @@ -iptv-checker +iptv-checker [中文版本](https://github.com/zhimin-dev/iptv-checker/blob/main/cn.md) -# iptv-checker +## iptv-checker -This project is split into 2 projects +IPTV checker tool for Docker && Desktop && CMD, check your playlist is available -- Frontend [iptv-checker-web:v4.0.1](https://github.com/zhimin-dev/iptv-checker-web), providing the backend page for iptv-checker -- Backend [iptv-checker-rs:v4.0.1](https://github.com/zhimin-dev/iptv-checker-rs), providing cmd commands and web API for IPTV +- For container versions, go to the [docker hub](https://hub.docker.com/r/zmisgod/iptvchecker) page to find the relevant commands -## Docker Local Packaging +- In command-line mode, go to [GitHub's release page](https://github.com/zhimin-dev/iptv-checker/releases) and look for the download file with a version number that starts with `v`(default version) -First, clone the following 3 projects to your local machine (for example, place them in a node folder). Below is an example of the folder structure. - -- node - - iptv-checker - - iptv-checker-web - - iptv-checker-rs - -```bash -# Enter the node folder -cd node - -# Execute build -docker build -f iptv-checker/dockerfile -t ipserver . - -# Run -docker run -d -p 8081:8089 --name myIp ipserver - -# Alternatively, specify the port (this time specifying the port as 10001, you need to change the two 10001 places below), output file mapping to local directory -docker run -d -p 8081:10001 -e WEB_PORT=10001 -v ~/icStatic/output:/app/static/output --name myIp ipserver -``` +- For the desktop version, please go to [GitHub's release page](https://github.com/zhimin-dev/iptv-checker/releases) and look for the download file with a version number that starts with `d`(means desktop) ### Docker Official Package Usage @@ -40,19 +20,15 @@ Run the docker version of iptv-checker with the following commands ```bash docker pull zmisgod/iptvchecker + docker run -d -p 8081:8089 --name myIp zmisgod/iptvchecker + +# Alternatively, specify the port (this time specifying the port as 10001, you need to change the two 10001 places below), output file mapping to local directory +docker run -d -p 8081:10001 -e WEB_PORT=10001 -v ~/icStatic/output:/app/static/output --name myIp ipserver ``` Then open your browser and visit `http://127.0.0.1:8081/`. -### Docker Local Multi-Platform Package Method - -```bash -docker buildx create --name mybuilder -docker buildx inspect --bootstrap -docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t zmisgod/iptvchecker:latest --push -f iptv-checker/dockerfile . -``` - ### Docker-Compose Deployment ```bash @@ -61,6 +37,8 @@ docker-compose up -d ## Changelog +- v4.0.2 + - fixed the issue that it could not be played on the Windows platform - v4.0.1 - Bug Fixes - Issue with the source input box not recognizing data diff --git a/cn.md b/cn.md index da245ba..6d327fd 100644 --- a/cn.md +++ b/cn.md @@ -1,36 +1,16 @@ -iptv-checker +iptv-checker [English Version](https://github.com/zhimin-dev/iptv-checker/blob/main/README.md) -# iptv-checker +## iptv-checker -本项目拆成2个项目 +适用于Docker & Desktop & & CMD的IPTV检查工具，请检查您的播放列表是否可用 -- 前端[iptv-checker-web:v4.0.1](https://github.com/zhimin-dev/iptv-checker-web),提供iptv-checker后台页面 -- 后端[iptv-checker-rs:v4.0.1](https://github.com/zhimin-dev/iptv-checker-rs),提供iptv的cmd命令以及web api +- 对于容器版本，请前往 [docker hub](https://hub.docker.com/r/zmisgod/iptvchecker) 页面查找相关命令 -## docker本地打包 +- 在命令行模式下，转到 [GitHub 的发布页面](https://github.com/zhimin-dev/iptv-checker/releases) 并查找版本号以 'v' 开头的下载文件 -先将下面3个项目clone到本地(比如放在node文件夹下)，下面为文件夹目录示例 - -- node - - iptv-checker - - iptv-checker-web - - iptv-checker-rs - -```bash -# 进入node文件夹 -cd node - -# 执行build -docker build -f iptv-checker/dockerfile -t ipserver . - -# 运行 -docker run -d -p 8081:8089 --name myIp ipserver - -# 或者指定端口（本次指定端口为 10001，下面2个10001的地方都需要改动）、输出文件映射本地目录 -docker run -d -p 8081:10001 -e WEB_PORT=10001 -v ~/icStatic/output:/app/static/output --name myIp ipserver -``` +- 对于桌面版本，请前往 [GitHub 的发布页面](https://github.com/zhimin-dev/iptv-checker/releases) 并查找版本号以 'd' 开头的下载文件 ### Docker官方包使用方法 @@ -39,20 +19,18 @@ docker run -d -p 8081:10001 -e WEB_PORT=10001 -v ~/icStatic/output:/app/static/o 按照下面的命令运行docker版本的iptv-checker ```bash +# 拉取镜像 docker pull zmisgod/iptvchecker + +# 运行镜像 docker run -d -p 8081:8089 --name myIp zmisgod/iptvchecker + +# 或者指定端口（本次指定端口为 10001，下面2个10001的地方都需要改动）、输出文件映射本地目录 +docker run -d -p 8081:10001 -e WEB_PORT=10001 -v ~/icStatic/output:/app/static/output --name myIp ipserver ``` 再打开浏览器访问`http://127.0.0.1:8081/`即可 -### Docker本地打多平台包方法 - -```bash -docker buildx create --name mybuilder -docker buildx inspect --bootstrap -docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t zmisgod/iptvchecker:latest --push -f iptv-checker/dockerfile . -``` - ### Docker-Compose 部署 ```bash @@ -61,6 +39,8 @@ docker-compose up -d ## 更新日志 +- v4.0.2 + - 修复windows平台无法播放的问题 - v4.0.1 - bug修复 - 检测源输入框无法识别数据问题 diff --git a/dockerfile b/dockerfile index f8facfc..056f96d 100644 --- a/dockerfile +++ b/dockerfile @@ -3,7 +3,7 @@ FROM debian:buster-slim as frontend-builder # 设置工作目录 WORKDIR /usr/src/app # 复制前端代码 -COPY iptv-checker-web/dist ./frontend +COPY iptv-checker-ui-interface/dist ./frontend # 后端构建阶段 FROM rust:latest as backend-builder diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..3853666 Binary files /dev/null and b/icon.png differ