Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

DCD-558: Fix for Python argv[0] handling.

Browse Source
This commit is contained in:
Steve Smith 2019-08-12 15:54:29 +10:00
parent f791c640c3
commit 475779d50c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
entrypoint.py
View File

@ -81,6 +81,7 @@ for key, defval in defaults.items():
gen_cfg('server.xml.j2', server_xml, env)
######################################################################
# Start Confluence as the correct user
@ -91,10 +92,10 @@ if os.getuid() == 0:
cmd = '/bin/su'
start_cmd = ' '.join([start_cmd] + sys.argv[1:])
args = [user, '-c', start_cmd]
args = [cmd, user, '-c', start_cmd]
else:
cmd = start_cmd
args = sys.argv
args = [start_cmd] + sys.argv[1:]
logging.info("Running Confluence with command '{}', arguments {}".format(cmd, args))
os.execvp(cmd, args)
os.execv(cmd, args)