Update to v7.57.0

class_v2/btdockerModelV2/composeModel.py

@@ -314,7 +314,11 @@ class main(dockerBase):
         if not data:
             return public.return_message(-1, 0, public.lang("This template was not found!"))
         if os.path.exists(data['path']):
-            os.remove(data['path'])
+            # 删除模板文件 目录不处理
+            try:
+                os.remove(data['path'])
+            except:
+                pass
 
         get.id = get.template_id
 

class_v2/btdockerModelV2/containerModel.py

@@ -1205,12 +1205,12 @@ class main(dockerBase):
             if key not in data.keys():
                 data[str(port["PrivatePort"]) + "/" + port["Type"]] = [{
                     "HostIp": port["IP"],
-                    "HostPort": str(port["PublicPort"])
+                    "HostPort": str(port.get("PublicPort", ""))
                 }] if "IP" in port else None
             else:
                 data[str(port["PrivatePort"]) + "/" + port["Type"]].append({
                     "HostIp": port["IP"],
-                    "HostPort": str(port["PublicPort"])
+                    "HostPort": str(port.get("PublicPort", ""))
                 })
         return data
 

class_v2/btdockerModelV2/registryModel.py

@@ -292,7 +292,8 @@ class main(dockerBase):
 
             return public.returnMsg(True, str(res))
         except:
-            public.print_log(public.get_error_info())
+            error_info = public.get_error_info()
+            return public.returnMsg(False, public.lang("Login test failed! Reason: {}", error_info))
         # except docker.errors.APIError as e:
         #     if "authentication required" in str(e):
         #         return public.returnMsg(False, public.lang("Login test failed! Reason: May be account password error, please check!"))

class_v2/btdockerModelV2/setupModel.py

@@ -792,7 +792,7 @@ fi
 
         return public.return_message(0, 0, public.lang("The installation task has been added to the queue!"))
 
-    @staticmethod
+
     def uninstall_status(self, get):
         """
         检测docker是否可以卸载