From 0872ac46a1eb1aa125751ac79aac145c4882a7fa Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Wed, 15 Mar 2023 02:26:52 +0000 Subject: [PATCH] process --- appmanage/api/service/manage.py | 3 ++- appmanage/api/utils/docker.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py index 06a188e7..7a145194 100644 --- a/appmanage/api/service/manage.py +++ b/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: diff --git a/appmanage/api/utils/docker.py b/appmanage/api/utils/docker.py index 67177d82..6806b3e2 100644 --- a/appmanage/api/utils/docker.py +++ b/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"