diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index d6cf741e..ef28a3a5 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -10,7 +10,7 @@ COPY static ./static COPY requirements.txt main.py ./ RUN apt update -# Install supervisords +# Install supervisord RUN apt install -y supervisor COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/cmd.sh /cmd.sh diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py index 7770e47c..18323f1f 100644 --- a/appmanage/api/service/manage.py +++ b/appmanage/api/service/manage.py @@ -106,6 +106,8 @@ def get_update_list(): local_version = json.loads(op)['VERSION'] version_contents = get_github_content(repo, 'install/version.json') version = json.loads(version_contents)['VERSION'] + ret = {} + ret['current_version'] = local_version if compared_version(local_version, version) == -1: content = [] change_log_contents = get_github_content(repo, 'CHANGELOG.md') @@ -114,13 +116,13 @@ def get_update_list(): for change in change_log[1:]: if change != '': content.append(change) - ret = {} - ret['version'] = version + + ret['latest_version'] = version ret['date'] = date ret['content'] = content return ret else: - return None + return ret def conbine_list(installing_list, installed_list):