beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-22 15:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

latest

Browse source
This commit is contained in:
qiaofeng1227 2023-07-27 10:09:15 +08:00
parent 028d1103db
commit ac6ba075b4
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build_appmanage.yml vendored
View file

@ -30,6 +30,7 @@ jobs:
with: with:
image: websoft9dev/appmanage image: websoft9dev/appmanage
tags: ${{ env.VERSION }} tags: ${{ env.VERSION }}
addLatest: True
registry: docker.io registry: docker.io
dockerfile: appmanage/Dockerfile dockerfile: appmanage/Dockerfile
directory: appmanage directory: appmanage

2
appmanage/api/service/manage.py
View file

@ -112,7 +112,7 @@ def get_update_list():
local_version = json.loads(op)['VERSION'] local_version = json.loads(op)['VERSION']
except: except:
local_version = "0.0.0" local_version = "0.0.0"
version_cmd = "curl" + const.ARTIFACT_URL + "/version.json" version_cmd = "curl " + const.ARTIFACT_URL + "/version.json"
latest = shell_execute.execute_command_output_all(version_cmd)['result'] latest = shell_execute.execute_command_output_all(version_cmd)['result']
version = json.loads(latest)['VERSION'] version = json.loads(latest)['VERSION']
ret = {} ret = {}

2
appmanage/api/utils/shell_execute.py
View file

@ -15,7 +15,7 @@ def execute_command_output_all(cmd_str):
myLogger.info_logger("Start to execute cmd: " + cmd_str) myLogger.info_logger("Start to execute cmd: " + cmd_str)
process = subprocess.run(f'nsenter -m -u -i -n -p -t 1 sh -c "{cmd_str}"', capture_output=True, check=False, text=True, shell=True) process = subprocess.run(f'nsenter -m -u -i -n -p -t 1 sh -c "{cmd_str}"', capture_output=True, bufsize=65536, check=False, text=True, shell=True)
if process.returncode == 0 and 'Fail' not in process.stdout and 'fail' not in process.stdout and 'Error' not in process.stdout and 'error' not in process.stdout: if process.returncode == 0 and 'Fail' not in process.stdout and 'fail' not in process.stdout and 'Error' not in process.stdout and 'error' not in process.stdout: