| -rwxr-xr-x | kiwi-build | 5 | ||||
| -rwxr-xr-x | scripts/fedora-kiwi-bundle-format-generator | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -63,6 +63,11 @@ if [ "$image_type" = "iso" ]; then kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}" fi +if [ "$image_type" = "oci" ]; then + # Extend for OCI images + kiwi_bundle_format="${kiwi_bundle_format}.%T" +fi + set +e if [ ! ${kiwi_isolated} ]; then diff --git a/scripts/fedora-kiwi-bundle-format-generator b/scripts/fedora-kiwi-bundle-format-generator index 7c48324..a03d253 100755 --- a/scripts/fedora-kiwi-bundle-format-generator +++ b/scripts/fedora-kiwi-bundle-format-generator @@ -14,6 +14,7 @@ import xml.etree.ElementTree as ET parser = ArgumentParser(description="Generator of kiwi bundle formats for Fedora image builds") parser.add_argument("kiwi_file", type=Path, default="Fedora.kiwi", help="kiwi description file") parser.add_argument("image_profile", type=str, help="kiwi image profile") +parser.add_argument("--oci-variant", "-o", action="store_true", help="generate oci variant") args = parser.parse_args() xml_tree = ET.parse(args.kiwi_file) @@ -22,4 +23,9 @@ image_root = xml_tree.getroot() image_basename = image_root.attrib["name"] image_profile = args.image_profile -print(f"{image_basename}-{image_profile}-%v.%I.%A") +image_bundle_format = f"{image_basename}-{image_profile}-%v.%I.%A" + +if args.oci_variant: + print(f"{image_bundle_format}.%T") +else: + print(image_bundle_format) |