particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild.py: clean up bind mounts for stages

Browse source 
Allow input_dir for assemblers, but mount the tree read-only.
This commit is contained in:
Lars Karlitski 2019-06-14 19:32:05 +02:00
parent e6dd428107
commit bc36adc1f1
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
osbuild.py
View file

@ -66,11 +66,11 @@ class BuildRoot:
"--volatile=yes", "--volatile=yes",
f"--machine={self.machine_name}", f"--machine={self.machine_name}",
f"--directory={self.buildroot}", f"--directory={self.buildroot}",
f"--bind={libdir}/osbuild-run:/run/osbuild-run", f"--bind-ro=/etc/pki",
f"--bind={self.tree}:/tmp/tree", f"--bind={libdir}/osbuild-run:/tmp/osbuild-run",
*[f"--bind={src}:{dest}" for src, dest in binds], *[f"--bind={b}" for b in binds],
*[f"--bind-ro={src}:{dest}" for src, dest in readonly_binds], *[f"--bind-ro={b}" for b in readonly_binds],
"/run/osbuild-run", "/tmp/osbuild-run",
] + argv, *args, **kwargs) ] + argv, *args, **kwargs)
def run_stage(self, stage, options={}, input_dir=None): def run_stage(self, stage, options={}, input_dir=None):
@ -80,41 +80,42 @@ class BuildRoot:
"input_dir": None "input_dir": None
} }
robinds = [ robinds = [f"{libdir}/stages/{stage}:/tmp/{stage}"]
(f"{libdir}/stages/{stage}", "/tmp/stage"), binds = [f"{self.tree}:/tmp/tree"]
("/etc/pki", "/etc/pki")
]
if input_dir: if input_dir:
robinds.append(f"{input_dir}:/tmp/input")
options["input_dir"] = "/tmp/input" options["input_dir"] = "/tmp/input"
robinds.append((input_dir, "/tmp/input"))
try: try:
self.run(["/tmp/stage"], readonly_binds=robinds, self.run([f"/tmp/{stage}"], binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True)
input=json.dumps(options), encoding="utf-8", check=True)
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
raise StageFailed(stage, error.returncode) raise StageFailed(stage, error.returncode)
def run_assembler(self, name, options, output_dir=None): def run_assembler(self, stage, options, input_dir=None, output_dir=None):
if output_dir and not os.path.exists(output_dir): if output_dir and not os.path.exists(output_dir):
os.makedirs(output_dir) os.makedirs(output_dir)
options = { options = {
**options, **options,
"tree": "/tmp/tree", "tree": "/tmp/tree",
"input_dir": None "input_dir": None,
"output_dir": None
} }
robinds = [ robinds = [
(f"{libdir}/stages/{name}", "/tmp/stage"), f"{self.tree}:/tmp/tree",
("/etc/pki", "/etc/pki") f"{libdir}/stages/{stage}:/tmp/{stage}"
] ]
binds = [] binds = []
if input_dir:
robinds.append(f"{input_dir}:/tmp/input")
options["input_dir"] = "/tmp/input"
if output_dir: if output_dir:
binds.append(f"{output_dir}:/tmp/output")
options["output_dir"] = "/tmp/output" options["output_dir"] = "/tmp/output"
binds.append((output_dir, "/tmp/output"))
try: try:
self.run(["/tmp/stage"], binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True) self.run([f"/tmp/{stage}"], binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True)
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
raise StageFailed(stage, error.returncode) raise StageFailed(stage, error.returncode)