almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

container: Factor out loading an image tarball

Browse source
This commit is contained in:
Alex Pyrgiotis 2024-12-02 16:30:43 +02:00
parent 6b51d56e9f
commit 20152fac13
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dangerzone/isolation_provider/container.py
View file

@ -227,16 +227,14 @@ class Container(IsolationProvider):
)
@staticmethod
def install() -> bool:
"""
Make sure the podman container is installed. Linux only.
"""
if Container.is_container_installed():
return True
def get_expected_tag() -> str:
"""Get the tag of the Dangerzone image tarball from the image-id.txt file."""
with open(get_resource_path("image-id.txt")) as f:
return f.read.strip()
# Load the container into podman
@staticmethod
def load_image_tarball() -> None:
log.info("Installing Dangerzone container image...")
p = subprocess.Popen(
[Container.get_runtime(), "load"],
stdin=subprocess.PIPE,
@ -263,6 +261,18 @@ class Container(IsolationProvider):
f"Could not install container image: {error}"
)
log.info("Successfully installed container image from")
@staticmethod
def install() -> bool:
"""
Make sure the podman container is installed. Linux only.
"""
if Container.is_container_installed():
return True
Container.load_image_tarball()
if not Container.is_container_installed(raise_on_error=True):
return False