You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
2.1 KiB
55 lines
2.1 KiB
2 years ago
|
From ec7f9c2f6e26b74e6f41b3fe67998e9c2aa6dec0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tomas Kopecek <tkopecek@redhat.com>
|
||
|
|
Date: Sep 15 2022 07:08:50 +0000
|
||
|
|
Subject: kiwi: handle include protocols
|
||
|
|
|
||
|
|
|
||
|
|
Related: https://pagure.io/koji/issue/3495
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst
|
||
|
|
index 1a6994a..6654504 100644
|
||
|
|
--- a/docs/source/plugins.rst
|
||
|
|
+++ b/docs/source/plugins.rst
|
||
|
|
@@ -282,6 +282,13 @@ option. Similarly to other image tasks, alternative architecture failures can be
|
||
|
|
ignored for successful build by ``--can-fail`` option. ``--arch`` can be used to
|
||
|
|
limit build tag architectures.
|
||
|
|
|
||
|
|
+There are some limitation to used kiwi configuration:
|
||
|
|
+
|
||
|
|
+ * ``include`` node can use only ``this://`` protocol. Other types like ``file://``
|
||
|
|
+ or ``https://`` could reach out of the repo preventing reproducible build.
|
||
|
|
+ * All repositories from description (and included files) are removed and replaced
|
||
|
|
+ by buildroot repo and other repositories specified by ``--repo`` option.
|
||
|
|
+
|
||
|
|
Driver Update Disks building
|
||
|
|
============================
|
||
|
|
|
||
|
|
diff --git a/plugins/builder/kiwi.py b/plugins/builder/kiwi.py
|
||
|
|
index 41ef82e..9148fc5 100644
|
||
|
|
--- a/plugins/builder/kiwi.py
|
||
|
|
+++ b/plugins/builder/kiwi.py
|
||
|
|
@@ -4,6 +4,7 @@ import xml.dom.minidom
|
||
|
|
from fnmatch import fnmatch
|
||
|
|
|
||
|
|
import koji
|
||
|
|
+import koji.util
|
||
|
|
from koji.tasks import ServerExit
|
||
|
|
from __main__ import BaseBuildTask, BuildImageTask, BuildRoot, SCM
|
||
|
|
|
||
|
|
@@ -199,6 +200,12 @@ class KiwiCreateImageTask(BaseBuildTask):
|
||
|
|
# doing it recursively)
|
||
|
|
for inc_node in image.getElementsByTagName('include'):
|
||
|
|
path = inc_node.getAttribute('from')
|
||
|
|
+ if path.startswith('this://'):
|
||
|
|
+ path = koji.util.joinpath(desc_path, path[7:])
|
||
|
|
+ else:
|
||
|
|
+ # we want to ignore other protocols, e.g. file://, https://
|
||
|
|
+ # reachingoutside of repo
|
||
|
|
+ raise ValueError("Unhandled include protocol in include path: {path}.")
|
||
|
|
inc = xml.dom.minidom.parse(path) # nosec
|
||
|
|
# every included xml has image root element again
|
||
|
|
for node in inc.getElementsByTagName('image').childNodes:
|
||
|
|
|