Merge pull request #4873 from hiddify/dev

10.85.0b4

Author: hiddify-com

.github/workflows/docker.yaml

@@ -74,7 +74,7 @@ jobs:
     needs:
       - make-upload-docker
     env:
-      LATEST: "${{ github.ref_type == 'tag' && (endsWith(github.ref_name , 'dev') && 'beta' ||'latest') || 'dev' }}"
+      LATEST: "${{ github.ref_type == 'tag' && (contains(github.ref_name, 'b') && 'beta' ||'latest') || 'dev' }}"
     steps:
       - name: Download digests
         uses: actions/download-artifact@v4

.github/workflows/release.yml

@@ -65,6 +65,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: "*.zip"
-          prerelease: ${{ contains(github.ref_name,'dev') }}
+          prerelease: ${{ contains(github.ref_name,'b') }}
           body_path: release_message.md
 

HISTORY.md

@@ -5,6 +5,12 @@
 
 ### Fix
 
+* Beta bug. [hiddify-com]
+
+* Docker. [hiddify-com]
+
+* Beta version. [hiddify-com]
+
 * Fixed location. [hiddify-com]
 
 * Docker issue, disable auto update by env variable. [hiddify-com]

VERSION

@@ -1 +1 @@
-10.85.0b2
+10.85.0b4

common/docker-installer.sh

@@ -37,10 +37,9 @@ sed -i "s/hiddify-manager:latest/hiddify-manager:$TAG/g" docker-compose.yml
 echo "REDIS_PASSWORD=$redispassword"> docker.env
 echo "MYSQL_PASSWORD=$mysqlpassword">> docker.env
 
-cp docker.env .env
-
 # Start the containers using Docker Compose
-docker compose up -d --pull
+docker compose pull
+docker compose up -d 
 
 # Follow the logs from the containers
 docker compose logs -f

common/hiddify_installer.sh

@@ -336,7 +336,7 @@ fi
 
 
 export USE_VENV=310
-if [[ " $@ " == *" dev "* || " $@ " == *" docker "* || " $@ " == *" develop "* ]];then
+if [[ " $@ " == *" dev "* || " $@ " == *" docker "* || " $@ " == *" develop "* || " $@ " == *" beta "* ]];then
     export USE_VENV=313
 fi
 

hiddify-panel/src

@@ -103,7 +103,6 @@
       "tag": "DNS-Internal",
       "protocol": "dns",
       "settings": {
-        "address": "{{hconfigs['dns_server'] or '1.1.1.1'}}",
         "port": 53
       }
     }