From be31c3cf69532912a70ccb3cf350ae7c642b0b0a Mon Sep 17 00:00:00 2001 From: ngfchl Date: Sun, 28 Aug 2022 23:08:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B9=E5=99=A8=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E4=BB=A5=E6=8F=90=E7=A4=BA=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=88=90=E5=8A=9F=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto_pt/views.py | 8 +++++++- templates/auto_pt/restart.html | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/auto_pt/views.py b/auto_pt/views.py index 1340241..ee15d55 100644 --- a/auto_pt/views.py +++ b/auto_pt/views.py @@ -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, diff --git a/templates/auto_pt/restart.html b/templates/auto_pt/restart.html index 05eb6b3..e5e93b6 100644 --- a/templates/auto_pt/restart.html +++ b/templates/auto_pt/restart.html @@ -16,7 +16,7 @@ width="200" trigger="hover" content="如果遇到无法更新的情况,您可以选择重建容器或者进入容器命令行到项目根目录执行`git pull`命令!"> - {{ update_tips }} + {{ update_tips }} + 启动时间:{{ started_at }} @@ -103,6 +103,7 @@ update_log:[], update: false, local_log_width:24, + started_at:{{ started_at }} }, created() {