almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-05-01 11:12:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Remove previously installed containers after an upgrade

Browse source
This commit is contained in:
Alexis Métaireau 2025-04-30 19:33:59 +02:00
parent e9ddf8b375
commit eaad47720b
No known key found for this signature in database
GPG key ID: C65C7A89A8FFC56E
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dangerzone/container_utils.py
View file

@ -104,7 +104,7 @@ def get_runtime_version(runtime: Optional[Runtime] = None) -> Tuple[int, int]:
raise RuntimeError(msg)
def list_image_tags() -> List[str]:
def list_image_digests() -> List[str]:
"""Get the tags of all loaded Dangerzone images.
This method returns a mapping of image tags to image IDs, for all Dangerzone
@ -120,7 +120,7 @@ def list_image_tags() -> List[str]:
"image",
"list",
"--format",
"{{ .Tag }}",
"{{ .Digest }}",
container_name,
],
text=True,
@ -141,22 +141,34 @@ def add_image_tag(image_id: str, new_tag: str) -> None:
)
def delete_image_tag(tag: str) -> None:
"""Delete a Dangerzone image tag."""
def delete_image_digests(
digests: List[str], container_name: Optional[str] = None
) -> None:
"""Delete a Dangerzone image by its id."""
container_name = container_name or expected_image_name()
runtime = Runtime()
log.warning(f"Deleting old container image: {tag}")
full_digests = [f"{container_name}@{digest}" for digest in digests]
log.warning(f"Deleting old container images: {' '.join(full_digests)}")
try:
subprocess.check_output(
[str(runtime.name), "rmi", "--force", tag],
[str(runtime.name), "rmi", "--force", *full_digests],
startupinfo=get_subprocess_startupinfo(),
)
except Exception as e:
log.warning(
f"Couldn't delete old container image '{tag}', so leaving it there."
f"Couldn't delete old container images '{' '.join(full_digests)}', so leaving it there."
f" Original error: {e}"
)
def clear_old_images(digest_to_keep: str) -> None:
log.debug(f"Digest to keep: {digest_to_keep}")
digests = list_image_digests()
log.debug(f"Digests installed: {digests}")
to_remove = filter(lambda x: x != f"sha256:{digest_to_keep}", digests)
delete_image_digests(to_remove)
def load_image_tarball(tarball_path: Optional[Path] = None) -> None:
runtime = Runtime()
log.info("Installing Dangerzone container image...")

12
dangerzone/isolation_provider/container.py
View file

@ -122,26 +122,24 @@ class Container(IsolationProvider):
- An upgrade is available and `should_upgrade` is set to True
"""
installed_tags = container_utils.list_image_tags()
is_installed = container_utils.list_image_digests()
if not should_upgrade:
log.debug("Skipping container upgrade check as requested by the settings")
if not installed_tags:
if not is_installed:
install_local_container_tar()
else:
container_name = container_utils.expected_image_name()
update_available, image_digest = is_update_available(
container_name,
DEFAULT_PUBKEY_LOCATION,
)
update_available, image_digest = is_update_available(container_name)
if update_available and image_digest:
log.debug("Upgrading container image to %s", image_digest)
upgrade_container_image(image_digest, callback=callback)
container_utils.clear_old_images(digest_to_keep=image_digest)
settings = Settings()
settings.set("updater_container_needs_update", False, autosave=True)
else:
log.debug("No update available for the container.")
if not installed_tags:
if not is_installed:
install_local_container_tar()
try:
verify_local_image()