Merge pull request #76 from unidcml/main

Fixed geosite PR

.github/workflows/create-lists.yml

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

Dockerfile

@@ -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
 
-WORKDIR /app
-
 RUN CGO_ENABLED=0 GOOS=linux go install -ldflags="-s -w" \
     github.com/v2fly/domain-list-community@20250207120917
 

convert.py

@@ -335,10 +335,12 @@ def generate_dat_domains(data_path='geosite_data', output_name='geosite.dat', ou
     try:
         subprocess.run(
             ["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:
-        print(f"Compile error geosite.dat: {e}")
+        print(f"Compile error {data_path}: {e}")
 
 if __name__ == '__main__':
     # Russia inside
@@ -402,4 +404,4 @@ if __name__ == '__main__':
     prepare_dat_domains(directories, 'russia-inside')
     prepare_dat_domains(russia_outside, 'russia-outside')
     prepare_dat_domains(ukraine_inside, 'ukraine-inside')
-    generate_dat_domains()
+    generate_dat_domains()