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

osbuild.py: don't use /tmp in the build root

Browse source
This commit is contained in:
Lars Karlitski 2019-06-14 19:34:19 +02:00
parent bc36adc1f1
commit aea9dd1752
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
osbuild.py
View file

@ -67,27 +67,27 @@ class BuildRoot:
f"--machine={self.machine_name}", f"--machine={self.machine_name}",
f"--directory={self.buildroot}", f"--directory={self.buildroot}",
f"--bind-ro=/etc/pki", f"--bind-ro=/etc/pki",
f"--bind={libdir}/osbuild-run:/tmp/osbuild-run", f"--bind={libdir}/osbuild-run:/run/osbuild/osbuild-run",
*[f"--bind={b}" for b in binds], *[f"--bind={b}" for b in binds],
*[f"--bind-ro={b}" for b in readonly_binds], *[f"--bind-ro={b}" for b in readonly_binds],
"/tmp/osbuild-run", "/run/osbuild/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):
options = { options = {
**options, **options,
"tree": "/tmp/tree", "tree": "/run/osbuild/tree",
"input_dir": None "input_dir": None
} }
robinds = [f"{libdir}/stages/{stage}:/tmp/{stage}"] robinds = [f"{libdir}/stages/{stage}:/run/osbuild/{stage}"]
binds = [f"{self.tree}:/tmp/tree"] binds = [f"{self.tree}:/run/osbuild/tree"]
if input_dir: if input_dir:
robinds.append(f"{input_dir}:/tmp/input") robinds.append(f"{input_dir}:/run/osbuild/input")
options["input_dir"] = "/tmp/input" options["input_dir"] = "/run/osbuild/input"
try: try:
self.run([f"/tmp/{stage}"], binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True) self.run([f"/run/osbuild/{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)
@ -97,25 +97,25 @@ class BuildRoot:
options = { options = {
**options, **options,
"tree": "/tmp/tree", "tree": "/run/osbuild/tree",
"input_dir": None, "input_dir": None,
"output_dir": None "output_dir": None
} }
robinds = [ robinds = [
f"{self.tree}:/tmp/tree", f"{self.tree}:/run/osbuild/tree",
f"{libdir}/stages/{stage}:/tmp/{stage}" f"{libdir}/stages/{stage}:/run/osbuild/{stage}"
] ]
binds = [] binds = []
if input_dir: if input_dir:
robinds.append(f"{input_dir}:/tmp/input") robinds.append(f"{input_dir}:/run/osbuild/input")
options["input_dir"] = "/tmp/input" options["input_dir"] = "/run/osbuild/input"
if output_dir: if output_dir:
binds.append(f"{output_dir}:/tmp/output") binds.append(f"{output_dir}:/run/osbuild/output")
options["output_dir"] = "/tmp/output" options["output_dir"] = "/run/osbuild/output"
try: try:
self.run([f"/tmp/{stage}"], binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True) self.run([f"/run/osbuild/{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)