Merge pull request #4865 from tesilaaliset/fix/fix_docker

Fixing systemctl problem

Author: hiddify-com

common/docker-installer.sh

@@ -29,6 +29,8 @@ 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
 

common/hiddify_installer.sh

@@ -249,31 +249,34 @@ function post_update_tasks() {
         echo "---------------------Finished!------------------------"
     fi
     remove_lock $NAME
-    if [[ $panel_update == 0 ]]; then
-        systemctl kill -s SIGTERM hiddify-panel
-    fi
-    systemctl start hiddify-panel
-    
-    
-    cd /opt/hiddify-manager/hiddify-panel
-    if [ "$CREATE_EASYSETUP_LINK" == "true" ];then
-        hiddify-panel-cli set-setting --key create_easysetup_link --val True
-    fi
-    
-    case "$package_mode" in
-        release|beta)
-            hiddify-panel-cli set-setting --key package_mode --val $package_mode
-        ;;
-        dev|develop)
-            hiddify-panel-cli set-setting --key package_mode --val develop
-        ;;
-        *)
-            hiddify-panel-cli set-setting --key auto_update --val False
-        ;;
-    esac
-    
-    if [[ $panel_update == 0 && $config_update != 0 ]]; then
-        bash /opt/hiddify-manager/apply_configs.sh --no-gui --no-log
+
+    if [ "$package_mode" != "docker" ];then
+      if [[ $panel_update == 0 ]]; then
+              systemctl kill -s SIGTERM hiddify-panel
+      fi
+
+      systemctl start hiddify-panel
+
+      cd /opt/hiddify-manager/hiddify-panel
+      if [ "$CREATE_EASYSETUP_LINK" == "true" ];then
+          hiddify-panel-cli set-setting --key create_easysetup_link --val True
+      fi
+
+      case "$package_mode" in
+          release|beta)
+              hiddify-panel-cli set-setting --key package_mode --val $package_mode
+          ;;
+          dev|develop)
+              hiddify-panel-cli set-setting --key package_mode --val develop
+          ;;
+          *)
+              hiddify-panel-cli set-setting --key auto_update --val False
+          ;;
+      esac
+
+      if [[ $panel_update == 0 && $config_update != 0 ]]; then
+          bash /opt/hiddify-manager/apply_configs.sh --no-gui --no-log
+      fi
     fi
 }
 

docker-init.sh

@@ -33,6 +33,14 @@ fi
 
 cd $(dirname -- "$0")
 
+# Check systemctl is setup correctly for docker.
+systemctl is-active --quiet hiddify-panel
+if [ $? -ne 0 ]; then
+  echo "systemctl returned non-zero exit code. Re install systemctl..."
+  cp other/docker/* /usr/bin/
+  systemctl restart hiddify-panel
+fi
+
 DO_NOT_INSTALL=true ./install.sh install-docker --no-gui $@
 ./status.sh --no-gui
 

install.sh

@@ -53,12 +53,14 @@ function main() {
     fi
 
     # source common/set_config_from_hpanel.sh
-    update_progress "HiddifyPanel" "Reading Configs from Panel..." 5
-    set_config_from_hpanel
-    
-    update_progress "Applying Configs" "..." 8
-    
-    bash common/replace_variables.sh
+    if [ "$DO_NOT_RUN" != "true" ];then
+      update_progress "HiddifyPanel" "Reading Configs from Panel..." 5
+      set_config_from_hpanel
+
+      update_progress "Applying Configs" "..." 8
+
+      bash common/replace_variables.sh
+    fi
 
     if [ "$MODE" != "apply_users" ]; then
         bash ./other/deprecated/remove_deprecated.sh
@@ -103,7 +105,7 @@ function main() {
         fi
 
         update_progress "${PROGRESS_ACTION}" "Xray" 75
-        if [[ $(hconfig "core_type") == "xray" ]];then
+        if [[ $(hconfig "core_type") == "xray" ||  "$MODE" == "install-docker" ]];then
             install_run xray 1 &
         else
             install_run xray 0 &