From 3f053e63c90a9fdbd376d939e325a17752656bce Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Feb 03 2025 20:06:43 +0000 Subject: [PATCH 1/2] Fix a flake8 error that got in Signed-off-by: Jeremy Cline --- diff --git a/fedora-image-uploader/fedora_image_uploader/handler.py b/fedora-image-uploader/fedora_image_uploader/handler.py index 9a048f6..5c0c36a 100644 --- a/fedora-image-uploader/fedora_image_uploader/handler.py +++ b/fedora-image-uploader/fedora_image_uploader/handler.py @@ -397,7 +397,8 @@ class Uploader: repo = repos.get(image["subvariant"]) if not repo: _log.info( - "Skipping container subvariant %s from compose id %s as it has no configured repository", + "Skipping container subvariant %s from compose id %s as it has " + "no configured repository", image["subvariant"], ffrel.cid, ) From 1cdd40efad53269684d781723e6870edee089938 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Feb 03 2025 20:06:43 +0000 Subject: [PATCH 2/2] container: Accept the "bootable-container" type It was reported that the various atomic desktop variants weren't being updated on Quay.io. It appears that at some point the container type was changed from "ociarchive" to "bootable-container". Add that to the list of image types the container uploader will handle. Signed-off-by: Jeremy Cline --- diff --git a/fedora-image-uploader/fedora_image_uploader/handler.py b/fedora-image-uploader/fedora_image_uploader/handler.py index 5c0c36a..0c4d8ee 100644 --- a/fedora-image-uploader/fedora_image_uploader/handler.py +++ b/fedora-image-uploader/fedora_image_uploader/handler.py @@ -382,7 +382,7 @@ class Uploader: if ffrel.release.lower() != "eln" and ffrel.relnum < 40: _log.info("Skipping Fedora 39 images as they are not supported") return - if image["type"] not in ("docker", "ociarchive"): + if image["type"] not in ("docker", "ociarchive", "bootable-container"): _log.debug( "Skipping non-container image (type %s) in compose id %s", image["type"], ffrel.cid ) @@ -408,7 +408,7 @@ class Uploader: tag = "latest" else: tag = str(ffrel.relnum) - decompress = False if image["type"] == "ociarchive" else True + decompress = image["type"] == "docker" with tempfile.TemporaryDirectory() as workdir: image_path = download_image(image, workdir, decompress=decompress) for registry in registries: