yanistye/allow-domains
1
0
Fork 0
mirror of https://github.com/itdoginfo/allow-domains.git synced 2026-01-25 10:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76 from unidcml/main

Browse Source 
Fixed geosite PR
This commit is contained in:
itdoginfo
2025-02-08 21:59:47 +03:00
committed by GitHub
parent 72f5faca96 65fab2c74f
commit 679b1bc98d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/create-lists.yml vendored
View File

@@ -31,7 +31,7 @@ jobs:
-v ${{ github.workspace }}/Services:/app/Services \ -v ${{ github.workspace }}/Services:/app/Services \
-v ${{ github.workspace }}/SRS:/app/SRS \ -v ${{ github.workspace }}/SRS:/app/SRS \
-v ${{ github.workspace }}/DAT:/app/DAT \ -v ${{ github.workspace }}/DAT:/app/DAT \
itdoginfo/compilesrs:0.1.5 itdoginfo/compilesrs:0.1.6
- name: Check Russia/inside-dnsmasq-ipset - name: Check Russia/inside-dnsmasq-ipset
uses: itdoginfo/dnsmasq-action@0.1 uses: itdoginfo/dnsmasq-action@0.1
@@ -80,6 +80,6 @@ jobs:
uses: softprops/action-gh-release@v2.1.0 uses: softprops/action-gh-release@v2.1.0
with: with:
files: | files: |
"${{ github.workspace }}/SRS/*.srs" ${{ github.workspace }}/SRS/*.srs
"${{ github.workspace }}/DAT/*.dat" ${{ github.workspace }}/DAT/*.dat
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}

2
Dockerfile
View File

@@ -2,8 +2,6 @@ FROM ghcr.io/sagernet/sing-box:v1.10.7 AS sing-box
FROM golang:1.22.12-alpine3.21 AS go-builder FROM golang:1.22.12-alpine3.21 AS go-builder
WORKDIR /app
RUN CGO_ENABLED=0 GOOS=linux go install -ldflags="-s -w" \ RUN CGO_ENABLED=0 GOOS=linux go install -ldflags="-s -w" \
github.com/v2fly/domain-list-community@20250207120917 github.com/v2fly/domain-list-community@20250207120917

6
convert.py
View File

@@ -335,10 +335,12 @@ def generate_dat_domains(data_path='geosite_data', output_name='geosite.dat', ou
try: try:
subprocess.run( subprocess.run(
["domain-list-community", f"-datapath={data_path}", f"-outputname={output_name}", f"-outputdir={output_directory}"], ["domain-list-community", f"-datapath={data_path}", f"-outputname={output_name}", f"-outputdir={output_directory}"],
check=True check=True,
stdout=subprocess.DEVNULL
) )
print(f"Compiled .dat file: {output_directory}/{output_name}")
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print(f"Compile error geosite.dat: {e}") print(f"Compile error {data_path}: {e}")
if __name__ == '__main__': if __name__ == '__main__':
# Russia inside # Russia inside