1. 更新页面添加容器启动时间,以提示是否重启成功!

This commit is contained in:
ngfchl
2022-08-28 23:08:39 +08:00
parent dc276f168d
commit be31c3cf69
2 changed files with 9 additions and 2 deletions

View File

@@ -3,6 +3,7 @@ import socket
import subprocess
from datetime import datetime
import docker
import git
from django.http import JsonResponse
from django.shortcuts import render
@@ -163,6 +164,11 @@ def restart_container(request):
# scraper = pt_spider.get_scraper()
# res = scraper.get('https://gitee.com/ngfchl/ptools/raw/master/update.md')
# update_md = markdown.markdown(res.text, extensions=['tables'])
# 获取docker对象
client = docker.from_env()
# 从内部获取容器id
cid = socket.gethostname()
started_at = client.api.inspect_container(cid).get('State').get('StartedAt')
if get_update_logs():
update = 'false'
update_tips = '目前您使用的是最新版本!'
@@ -171,7 +177,7 @@ def restart_container(request):
update_tips = '已有新版本,请根据需要升级!'
return render(request, 'auto_pt/restart.html',
context={
# 'update_md': update_md,
'started_at': started_at,
'local_logs': get_git_logs(),
'update_notes': get_git_logs(master='origin/master'),
'update': update,

View File

@@ -16,7 +16,7 @@
width="200"
trigger="hover"
content="如果遇到无法更新的情况,您可以选择重建容器或者进入容器命令行到项目根目录执行`git pull`命令!">
<el-link slot="reference" type="success">{{ update_tips }}</el-link>
<el-link slot="reference" type="success">{{ update_tips }} + <span>启动时间:{{ started_at }}</span></el-link>
</el-popover>
</span>
<span style="float: right;margin-top: -10px">
@@ -103,6 +103,7 @@
update_log:[],
update: false,
local_log_width:24,
started_at:{{ started_at }}
},
created()
{