mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

🪆 --as-root to run command inside of container/VM as root

Browse source
This commit is contained in:
Michael Pöhn 2025-10-14 13:24:42 +02:00 • committed by Hans-Christoph Steiner
parent 60f5f8fa1c
commit 69c67badfb
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
fdroidserver/common.py
View file

@ -5135,28 +5135,29 @@ def get_podman_container(appid, vercode):
return ret return ret
def inside_exec(appid, vercode, command, virt_container_type): def inside_exec(appid, vercode, command, virt_container_type, as_root=False):
"""Execute the command inside of the VM for the build.""" """Execute the command inside of the VM for the build."""
if virt_container_type == 'vagrant': if virt_container_type == 'vagrant':
return vagrant_exec(appid, vercode, command) return vagrant_exec(appid, vercode, command, as_root)
elif virt_container_type == 'podman': elif virt_container_type == 'podman':
return podman_exec(appid, vercode, command) return podman_exec(appid, vercode, command, as_root)
else: else:
raise Exception( raise Exception(
f"'{virt_container_type}' not supported, currently supported: vagrant, podman" f"'{virt_container_type}' not supported, currently supported: vagrant, podman"
) )
def podman_exec(appid, vercode, command): def podman_exec(appid, vercode, command, as_root=False):
"""Execute the command inside of a podman container for the build.""" """Execute the command inside of a podman container for the build."""
container_name = get_container_name(appid, vercode) container_name = get_container_name(appid, vercode)
to_stdin = shlex.join(command) to_stdin = shlex.join(command)
user = 'root' if as_root else BUILD_USER
p = subprocess.run( p = subprocess.run(
[ [
'podman', 'podman',
'exec', 'exec',
'--interactive', '--interactive',
'--user=vagrant', f'--user={user}',
f'--workdir={BUILD_HOME}', f'--workdir={BUILD_HOME}',
container_name, container_name,
] ]
@ -5181,7 +5182,7 @@ def get_vagrantfile_path(appid, vercode):
return Path('tmp/buildserver', get_container_name(appid, vercode), 'Vagrantfile') return Path('tmp/buildserver', get_container_name(appid, vercode), 'Vagrantfile')
def vagrant_exec(appid, vercode, command): def vagrant_exec(appid, vercode, command, as_root=False):
"""Execute a command in the Vagrant VM via ssh.""" """Execute a command in the Vagrant VM via ssh."""
vagrantfile = get_vagrantfile_path(appid, vercode) vagrantfile = get_vagrantfile_path(appid, vercode)
to_stdin = shlex.join(command) to_stdin = shlex.join(command)
@ -5190,7 +5191,7 @@ def vagrant_exec(appid, vercode, command):
'vagrant', 'vagrant',
'ssh', 'ssh',
'-c', '-c',
'bash', 'sudo bash' if as_root else 'bash',
], ],
input=to_stdin, input=to_stdin,
text=True, text=True,

8
fdroidserver/exec.py
View file

@ -2,6 +2,7 @@
# #
# exec.py - part of the FDroid server tools # exec.py - part of the FDroid server tools
# Copyright (C) 2024-2025, Hans-Christoph Steiner <hans@eds.org> # Copyright (C) 2024-2025, Hans-Christoph Steiner <hans@eds.org>
# Copyright (C) 2024-2025, Michael Pöhn <michael@poehn.at>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
@ -34,6 +35,12 @@ def main():
parser = ArgumentParser( parser = ArgumentParser(
description="Run a subcommand in the buildserver container/box." description="Run a subcommand in the buildserver container/box."
) )
parser.add_argument(
'--as-root',
default=False,
action='store_true',
help="run command inside of container/VM as root user",
)
common.setup_global_opts(parser) common.setup_global_opts(parser)
common.setup_virt_container_type_opts(parser) common.setup_virt_container_type_opts(parser)
parser.add_argument( parser.add_argument(
@ -53,6 +60,7 @@ def main():
vercode, vercode,
options.COMMAND, options.COMMAND,
common.get_virt_container_type(options), common.get_virt_container_type(options),
options.as_root,
) )
except Exception as e: except Exception as e:
if options.verbose: if options.verbose: