Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactors how extra args for container executables are specified

Browse Source
This commit is contained in:
John Richards
2021-10-21 22:33:03 -04:00
parent 034c65885f
commit 21b08557ce
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/pymultic
View File

@@ -54,7 +54,10 @@ PYVER_CONTAINERS = {
'3.10',
}
CONTAINER_EXES = ['podman', 'docker']
CONTAINER_EXE_ARGS = { 'docker': ['-u', '{}:{}'.format(os.getuid(), os.getgid())] } # Docker requires extra magic for permissions.
CONTAINER_EXE_EXTRA_ARGS = {
'podman': [],
'docker': ['-u', '{}:{}'.format(os.getuid(), os.getgid())], # Docker requires extra magic for permissions.
}
def fetch_python(snekdir, version):
@@ -220,7 +223,7 @@ def container_compile(ver, infile):
os.unlink(outfile)
print('*** Compiling for Python {}'.format(fullver))
proc = subprocess.Popen([container_exe, 'run'] + CONTAINER_EXE_ARGS.get(container_exe, []) +
proc = subprocess.Popen([container_exe, 'run'] + CONTAINER_EXE_EXTRA_ARGS[container_exe] +
['--rm', '--name', '{}'.format(outfile),
'-v', '{}:/indir:Z'.format(indir),
'-v', '{}:/outdir:Z'.format(os.getcwd()), '-w', '/outdir',