stages: rework container-deploy stage to not use tmp storage

This commit reworks the `org.osbuild.container-deploy` stage to
not use a tmp storage when mounting the container image. This
is needed because of [0] but it should generally be fine because
inside the stages the real /var is a tmpfs (which is why we
triggered the bug in the first place).

[0] https://github.com/containers/storage/issues/1779
This commit is contained in:
Michael Vogt 2023-12-19 11:32:13 +01:00 committed by Brian C. Lane
parent 9a8b0ddb61
commit ac5653d9f1
2 changed files with 19 additions and 11 deletions

View file

@ -2,6 +2,7 @@
Test related utilities
"""
import os
import pathlib
import shutil
@ -16,7 +17,7 @@ def assert_dict_has(v, keys, expected_value):
assert v == expected_value
def make_fake_tree(basedir, fake_content: dict):
def make_fake_tree(basedir: pathlib.Path, fake_content: dict):
"""Create a directory tree of files with content.
Call it with:
@ -31,7 +32,7 @@ def make_fake_tree(basedir, fake_content: dict):
fp.write(content)
def make_fake_input_tree(tmpdir, fake_content: dict) -> str:
def make_fake_input_tree(tmpdir: pathlib.Path, fake_content: dict) -> str:
"""
Wrapper around make_fake_tree for "input trees"
"""