Added new webui support into docker

This commit is contained in:
simonmicro 2022-12-11 21:56:08 +01:00
parent ca7ba46507
commit 5674e26979
No known key found for this signature in database
GPG key ID: 033A4D4CE4E063D6
4 changed files with 22 additions and 6 deletions

View file

@ -28,8 +28,11 @@ log_file = os.environ.get('LOGFILE', 'STDOUT')
listen_ip = os.environ.get('IP', '::').split()
listen_port = os.environ.get('PORT', '1688')
def start_kms():
# Make sure the full path to the db exists
if not os.path.exists(os.path.dirname(dbPath)):
os.makedirs(os.path.dirname(dbPath), exist_ok=True)
# Build the command to execute
command = [PYTHON3, '-u', 'pykms_Server.py', listen_ip[0], listen_port]
for (arg, env) in argumentVariableMapping.items():
@ -41,10 +44,22 @@ def start_kms():
for i in range(1, len(listen_ip)):
command.append("-n")
command.append(listen_ip[i] + "," + listen_port)
command.append('-s')
command.append(dbPath)
loggersrv.debug("server_cmd: %s" % (" ".join(str(x) for x in command).strip()))
pykms_process = subprocess.Popen(command)
try:
time.sleep(2) # Wait for the server to start up
pykms_webui_env = os.environ.copy()
pykms_webui_env['PYKMS_SQLITE_DB_PATH'] = dbPath
pykms_webui_env['PORT'] = '8080'
pykms_webui_env['PYKMS_LICENSE_PATH'] = '/LICENSE'
pykms_webui_process = subprocess.Popen(['gunicorn', '--log-level', os.environ.get('LOGLEVEL'), 'pykms_WebUI:app'], env=pykms_webui_env)
except Exception as e:
loggersrv.error("Failed to start webui: %s" % e)
try:
pykms_process.wait()
except Exception:
@ -52,7 +67,7 @@ def start_kms():
pass
except KeyboardInterrupt:
pass
pykms_webui_process.terminate()
pykms_process.terminate()