Create subconverter
This commit is contained in:
parent
4f499b1f8f
commit
732134f165
|
@ -0,0 +1,42 @@
|
||||||
|
name: "subconverter docker build"
|
||||||
|
|
||||||
|
env:
|
||||||
|
PROJECT: subconverter
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Set tag
|
||||||
|
id: tag
|
||||||
|
run: |
|
||||||
|
TAG=$(cat ${{ env.PROJECT }}/Dockerfile | awk 'NR==4 {print $3}')
|
||||||
|
echo "::set-env name=TAG::$TAG"
|
||||||
|
- name: Docker Hub login
|
||||||
|
env:
|
||||||
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
run: |
|
||||||
|
echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
id: buildx
|
||||||
|
uses: crazy-max/ghaction-docker-buildx@v1
|
||||||
|
with:
|
||||||
|
buildx-version: latest
|
||||||
|
- name: Build Dockerfile
|
||||||
|
env:
|
||||||
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
run: |
|
||||||
|
docker buildx build \
|
||||||
|
--platform=linux/amd64,linux/arm64 \
|
||||||
|
--output "type=image,push=true" \
|
||||||
|
--file ${{ env.PROJECT }}/Dockerfile ./${{ env.PROJECT }} \
|
||||||
|
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ env.PROJECT }}:latest \
|
||||||
|
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ env.PROJECT }}:${TAG}
|
|
@ -0,0 +1,18 @@
|
||||||
|
FROM tindy2013/subconverter
|
||||||
|
MAINTAINER Stille <stille@ioiox.com>
|
||||||
|
|
||||||
|
ENV VERSION 0.6.4
|
||||||
|
|
||||||
|
WORKDIR /base
|
||||||
|
RUN apk add tzdata && \
|
||||||
|
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
||||||
|
echo "Asia/Shanghai" > /etc/timezone && \
|
||||||
|
apk del tzdata
|
||||||
|
|
||||||
|
COPY groups.txt rulesets.txt /base/snippets/
|
||||||
|
|
||||||
|
EXPOSE 25500
|
||||||
|
|
||||||
|
WORKDIR /base
|
||||||
|
|
||||||
|
CMD subconverter
|
|
@ -0,0 +1,19 @@
|
||||||
|
FROM alpine:3.8
|
||||||
|
MAINTAINER Stille <stille@ioiox.com>
|
||||||
|
|
||||||
|
ENV VERSION v0.6.4
|
||||||
|
|
||||||
|
WORKDIR /base
|
||||||
|
RUN apk add wget tzdata && \
|
||||||
|
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
||||||
|
echo "Asia/Shanghai" > /etc/timezone && \
|
||||||
|
wget -P /base https://github.com/tindy2013/subconverter/releases/download/${VERSION}/subconverter_linux64.tar.gz && \
|
||||||
|
tar xzf subconverter_linux64.tar.gz && \
|
||||||
|
rm -rf subconverter_linux64.tar.gz && \
|
||||||
|
apk del wget tzdata
|
||||||
|
|
||||||
|
COPY groups.txt rulesets.txt /base/subconverter/snippets/
|
||||||
|
|
||||||
|
EXPOSE 25500
|
||||||
|
|
||||||
|
CMD ./subconverter/subconverter
|
|
@ -0,0 +1,33 @@
|
||||||
|
# subconverter
|
||||||
|
|
||||||
|
GitHub [stilleshan/dockerfiles](https://github.com/stilleshan/dockerfiles)
|
||||||
|
Docker [stilleshan/subconverter](https://hub.docker.com/r/stilleshan/subconverter)
|
||||||
|
> *docker image support for X86 and ARM*
|
||||||
|
|
||||||
|
## 简介
|
||||||
|
subconverter 是基于原版 [[tindy2013/subconverter]](https://github.com/tindy2013/subconverter) 项目的修改版本.仅修改 **分组配置文件** 以解决以下问题.相关使用方法请参考官方项目.
|
||||||
|
|
||||||
|
- **增加**`Netflix`分组
|
||||||
|
- **去除**`自动选择 url-test`以解决连接数爆涨问题.
|
||||||
|
- **全球拦截** 增加`节点选择`,以满足`Google Analytics`等广告统计工具的访问需求.(新版本可能已解决此需求)
|
||||||
|
- **修改时区** 镜像默认时区为 Asia/Shanghai
|
||||||
|
|
||||||
|
## 更新
|
||||||
|
**2021-05-29** 更新 v0.6.4 版 docker 镜像同时支持 X86 和 ARM
|
||||||
|
|
||||||
|
## 部署
|
||||||
|
### docker 部署
|
||||||
|
```shell
|
||||||
|
docker run -d --name=subconverter --restart=always -p 25500:25500 stilleshan/subconverter
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 使用
|
||||||
|
### 网友分享的订阅转换地址
|
||||||
|
```shell
|
||||||
|
https://sub.ops.ci
|
||||||
|
https://subto.herokuapp.com
|
||||||
|
```
|
||||||
|
更多使用教程请参考 [[tindy2013/subconverter]](https://github.com/tindy2013/subconverter) 官方项目
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
🔰 节点选择`select`[]🎯 全球直连`.*
|
||||||
|
🎥 NETFLIX`select`[]🔰 节点选择`[]🎯 全球直连`.*
|
||||||
|
📲 电报信息`select`[]🔰 节点选择`[]🎯 全球直连`.*
|
||||||
|
🌍 国外媒体`select`[]🔰 节点选择`[]🎯 全球直连`.*
|
||||||
|
🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
|
||||||
|
🍎 苹果服务`select`[]🎯 全球直连`[]🔰 节点选择`.*
|
||||||
|
Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🔰 节点选择`.*
|
||||||
|
🐟 漏网之鱼`select`[]🎯 全球直连`[]🔰 节点选择`.*
|
||||||
|
🛑 全球拦截`select`[]REJECT`[]DIRECT`[]🔰 节点选择
|
||||||
|
🎯 全球直连`select`[]DIRECT
|
||||||
|
|
||||||
|
;♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
|
||||||
|
;⛔️ 广告拦截`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
|
||||||
|
;🚫 运营劫持`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
|
|
@ -0,0 +1,20 @@
|
||||||
|
🎯 全球直连,rules/LocalAreaNetwork.list
|
||||||
|
Ⓜ️ 微软服务,rules/MSServices.list
|
||||||
|
🎯 全球直连,rules/DivineEngine/Surge/Ruleset/Unbreak.list
|
||||||
|
🛑 全球拦截,rules/NobyDa/Surge/AdRule.list
|
||||||
|
🛑 全球拦截,rules/DivineEngine/Surge/Ruleset/Guard/Hijacking.list
|
||||||
|
🎥 NETFLIX,rules/DivineEngine/Surge/Ruleset/StreamingMedia/Video/Netflix.list
|
||||||
|
🌍 国外媒体,rules/DivineEngine/Surge/Ruleset/StreamingMedia/Streaming.list
|
||||||
|
🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Bilibili.list
|
||||||
|
🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/iQiyi.list
|
||||||
|
🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Letv.list
|
||||||
|
🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/MOO.list
|
||||||
|
🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Tencent Video.list
|
||||||
|
🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/Media/Youku.list
|
||||||
|
📲 电报信息,rules/DivineEngine/Surge/Ruleset/Extra/Telegram/Telegram.list
|
||||||
|
🔰 节点选择,rules/DivineEngine/Surge/Ruleset/Global.list
|
||||||
|
🍎 苹果服务,rules/DivineEngine/Surge/Ruleset/Extra/Apple/Apple.list
|
||||||
|
🎯 全球直连,rules/DivineEngine/Surge/Ruleset/China.list
|
||||||
|
🎯 全球直连,rules/NobyDa/Surge/Download.list
|
||||||
|
🎯 全球直连,[]GEOIP,CN
|
||||||
|
🐟 漏网之鱼,[]FINAL
|
Loading…
Reference in New Issue