ui - fix bug when Docker is used but Swarm is disabled, add jobs from API /reload and fix docker-compose doc

This commit is contained in:
bunkerity
2021-08-18 11:36:19 +02:00
parent aec22d1a81
commit 2a0b84074a
5 changed files with 38 additions and 16 deletions

View File

@@ -31,10 +31,10 @@ app.jinja_env.globals.update(form_service_gen=utils.form_service_gen)
app.jinja_env.globals.update(form_service_gen_multiple=utils.form_service_gen_multiple)
app.jinja_env.globals.update(form_service_gen_multiple_values=utils.form_service_gen_multiple_values)
@app.before_request
def log_request():
app.logger.debug("Request Headers %s", request.headers)
return None
#@app.before_request
#def log_request():
# app.logger.debug("Request Headers %s", request.headers)
# return None
# Login management
login_manager = LoginManager()

View File

@@ -56,7 +56,12 @@ class Instances :
if instance.status == "running" :
status = "up"
instances.append(self.__instance(id, name, type, status, instance))
if self.__docker.swarm != None :
is_swarm = True
try :
version = self.__docker.swarm.version
except :
is_swarm = False
if is_swarm :
for instance in self.__docker.services.list(filters={"label" : "bunkerized-nginx.UI"}) :
id = instance.id
name = instance.name