Merge branch 'main' into fix-docker

hiddify · Feb 17, 2025 · 9622530 · 9622530
2 parents 87af616 + 2f21922
commit 9622530
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/common/install.sh b/common/install.sh
@@ -8,6 +8,7 @@ python -m pip config set global.index-url https://pypi.org/simple > /dev/null
 # remove_package resolvconf
 # rm /etc/resolv.conf
 # ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+
 if [ "${MODE}" != "install-docker" ];then
   if [[ $COUNTRY == 'cn' ]]; then
       sudo timedatectl set-timezone Asia/Shanghai
@@ -17,6 +18,7 @@ if [ "${MODE}" != "install-docker" ];then
       sudo timedatectl set-timezone Asia/Tehran
   fi
 fi
+
 groupadd -f hiddify-common
 usermod -aG hiddify-common root
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,10 +1,10 @@
 services:
   hiddify:
     #only for local build and development
-    build: .
+    #build: .
 
     #latest release version
-    #image: ghcr.io/hiddify/hiddify-manager:latest
+    image: ghcr.io/hiddify/hiddify-manager:latest
 
     #latest beta version
     #image: ghcr.io/hiddify/hiddify-manager:beta
@@ -37,6 +37,7 @@ services:
     depends_on: 
       - mariadb
       - redis
+    network_mode: host
 
   mariadb:
     image: mariadb:latest