Make server version Docker-compatible (#130)
This commit is contained in:
parent
a7c081174b
commit
36294cb0a9
@ -775,10 +775,9 @@ def status():
|
||||
filen = url_for('static', filename='img/open.png')
|
||||
caniregister = True
|
||||
|
||||
version = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).strip()
|
||||
update = subprocess.check_output(["git", "log", "-1", "--format=%cd"]).strip()
|
||||
version = config['version']
|
||||
return render_template('status.html', title='STATUS', count=count, max=config['maxInstanceUsers'], file=filen,
|
||||
cani=caniregister, version=str(version)[2:-1], update=str(update)[2:-1])
|
||||
cani=caniregister, version=config['version'])
|
||||
|
||||
|
||||
@app.route('/error/<errno>')
|
||||
|
@ -47,7 +47,6 @@
|
||||
<div class="ui segments">
|
||||
<div class="ui segment">
|
||||
<p>Yotter version: <b><a href="https://github.com/ytorg/Yotter/commits/dev-indep">{{version}}</a></b></p>
|
||||
<p>Latest update: <b><a href="https://github.com/ytorg/Yotter/commits/dev-indep">{{update}}</a></b></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -11,5 +11,6 @@
|
||||
"admin_message":"Message from the admin text",
|
||||
"admin_user":"admin_username",
|
||||
"max_old_user_days": 60,
|
||||
"donate_url": ""
|
||||
"donate_url": "",
|
||||
"version": "2020.11.05"
|
||||
}
|
||||
|
Reference in New Issue
Block a user