particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/ostree: option to specify remotes

Browse source 
Add the ability to specify one ore more remotes for the system
repository. The required options for a single remote are its
`name` and the `url`. Optionally one or more branch can be passed
via `branches`. GPG keys can be given via `gpgkeys`; if none are
specified, no gpg verification will be done.
This commit is contained in:
Christian Kellner 2020-04-06 14:53:04 +02:00 • committed by David Rheinsberg
parent 4cfcd44480
commit 7be1fa7ac5
1 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

59
stages/org.osbuild.ostree
View file

@ -58,6 +58,39 @@ STAGE_OPTS = """
"description": "OStree ref to create and use for deployment",
"type": "string"
},
"remotes": {
"description": "Configure remotes for the system repository",
"type": "array",
"items": {
"description": "Description of a remote",
"type": "object",
"required": ["name", "url"],
"properties": {
"name": {
"description": "Identifier for the remote",
"type": "string"
},
"url": {
"description": "URL of the remote",
"type": "string"
},
"branches": {
"type": "array",
"items": {
"description": "Configured branches for the remote",
"type": "string"
}
},
"gpgkeys": {
"type": "array",
"items": {
"description": "GPG keys for the remote to verify commits",
"type": "string"
}
}
}
}
},
"rootfs": {
"description": "Identifier to locate the root file system",
"type": "object",
@ -81,12 +114,13 @@ STAGE_OPTS = """
"""
def ostree(*args, **kwargs):
def ostree(*args, _input=None, **kwargs):
args = list(args) + [f'--{k}={v}' for k, v in kwargs.items()]
print(f"ostree " + " ".join(args), file=sys.stderr)
subprocess.run(["ostree"] + args,
encoding="utf-8",
stdout=sys.stderr,
input=_input,
check=True)
@ -144,6 +178,7 @@ def main(tree, sources, options):
mounts = options.get("mounts", [])
kopts = options.get("kernel_opts", [])
ref = options.get("ref", commit)
remotes = options.get("remotes", [])
ostree("admin", "init-fs", "--modern", tree,
sysroot=tree)
@ -181,6 +216,28 @@ def main(tree, sources, options):
sysroot=tree,
os=osname)
for remote in remotes:
name = remote["name"]
url = remote["url"]
branches = remote.get("branches", [])
gpgkeys = remote.get("gpgkeys", [])
extra_args = []
if not gpgkeys:
extra_args += ["--no-gpg-verify"]
ostree("remote", "add",
"--if-not-exists",
*extra_args,
name, url,
*branches,
repo=f"{tree}/ostree/repo")
for key in gpgkeys:
ostree("remote", "gpg-import", "--stdin", name,
repo=f"{tree}/ostree/repo",
_input=key)
if __name__ == '__main__':
stage_args = json.load(sys.stdin)