qiaofeng1227 2 năm trước cách đây
mục cha
commit
0872ac46a1
2 tập tin đã thay đổi với 4 bổ sung3 xóa
  1. 2 1
      appmanage/api/service/manage.py
  2. 2 2
      appmanage/api/utils/docker.py

+ 2 - 1
appmanage/api/service/manage.py

@@ -143,8 +143,9 @@ def get_admin_url(app_name, url):
 
 def install_app_process(app_name):
 
+    real_name = docker.read_var(app_name, 'name')
     if docker.check_app_directory(app_name):
-        percentage = docker.get_process_perc(app_name)
+        percentage = docker.get_process_perc(app_name, real_name)
         ret = Response(code=const.RETURN_SUCCESS, message=percentage)
         ret = ret.dict()
     else:

+ 2 - 2
appmanage/api/utils/docker.py

@@ -7,10 +7,10 @@ from dotenv import load_dotenv, find_dotenv
 import dotenv
 from pathlib import Path
 
-def get_process_perc(app_name):
+def get_process_perc(app_name, real_name):
     
     process_now = "pulling"
-    output = shell_execute.execute_command_output_all("sudo docker image list |grep  " + app_name)
+    output = shell_execute.execute_command_output_all("sudo docker image list |grep  " + real_name)
     code = output["code"]
     if int(code) == 0 and output["result"] != "":
         process_now = "starting"