From 174a802803962c6fc94b849049cda5fe295a257b Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 11 Aug 2020 12:03:43 +0200 Subject: [PATCH] assemblers/ostree.commit: report compose metadata Pass all the compose metadata, as given by rpm-ostree via the compose.json, back to osbuild via the new api.metadata method. --- assemblers/org.osbuild.ostree.commit | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assemblers/org.osbuild.ostree.commit b/assemblers/org.osbuild.ostree.commit index af4b2fe2..16a86ea3 100755 --- a/assemblers/org.osbuild.ostree.commit +++ b/assemblers/org.osbuild.ostree.commit @@ -25,6 +25,7 @@ import subprocess import sys import tempfile +from osbuild import api from osbuild.util import ostree @@ -162,6 +163,11 @@ def main(tree, output_dir, options, meta): stdout=sys.stderr, check=True) + with open(os.path.join(output_dir, "compose.json"), "r") as f: + compose = json.load(f) + + api.metadata({"compose": compose}) + if tar: filename = tar["filename"] command = [