fix: SUDO_USER not used when starting container
This commit is contained in:
parent
f1bf3d7e1d
commit
d1baddc06d
1 changed files with 6 additions and 2 deletions
4
blend
4
blend
|
@ -149,8 +149,12 @@ def core_start_container(name, new_container=False):
|
||||||
subprocess.call(['podman', 'logs', '--since', str(start_time), name])
|
subprocess.call(['podman', 'logs', '--since', str(start_time), name])
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
if os.environ.get('SUDO_USER') == None:
|
||||||
logproc = pexpect.spawn(
|
logproc = pexpect.spawn(
|
||||||
'podman', args=['logs', '-f', '--since', str(start_time), name], timeout=3600)
|
'podman', args=['logs', '-f', '--since', str(start_time), name], timeout=3600)
|
||||||
|
else:
|
||||||
|
logproc = pexpect.spawn(
|
||||||
|
'sudo', args=['-u', os.environ.get('SUDO_USER'), 'podman', 'logs', '-f', '--since', str(start_time), name], timeout=3600)
|
||||||
logproc.logfile_read = sys.stdout.buffer
|
logproc.logfile_read = sys.stdout.buffer
|
||||||
|
|
||||||
logproc.expect('Started container.')
|
logproc.expect('Started container.')
|
||||||
|
|
Loading…
Reference in a new issue