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

oci-archive stage: Use source-epoch as creation data

Browse source 
If the source-epoch is specified, this is used as the creation date
instead of the current time.
This commit is contained in:
Alexander Larsson 2022-02-04 16:09:56 +01:00 • committed by Christian Kellner
parent 0ab4a6d401
commit 25b567990b
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
stages/org.osbuild.oci-archive
View file

@ -38,6 +38,7 @@ podman[3] with `podman pull oci-archive:<archive>`.
import datetime import datetime
import time
import json import json
import os import os
import subprocess import subprocess
@ -262,13 +263,13 @@ def config_from_options(options):
return config return config
def create_oci_dir(inputs, output_dir, options): def create_oci_dir(inputs, output_dir, options, create_time):
architecture = options["architecture"] architecture = options["architecture"]
now = datetime.datetime.utcnow().isoformat() + "Z" created = create_time.isoformat() + "Z"
config = { config = {
"created": now, "created": created,
"architecture": architecture, "architecture": architecture,
"os": "linux", "os": "linux",
"config": config_from_options(options["config"]), "config": config_from_options(options["config"]),
@ -305,7 +306,7 @@ def create_oci_dir(inputs, output_dir, options):
manifest["layers"].append(info) manifest["layers"].append(info)
config["rootfs"]["diff_ids"] = [digest] config["rootfs"]["diff_ids"] = [digest]
config["history"].append({ config["history"].append({
"created": now, "created": created,
"created_by": f"/bin/sh -c #(nop) osbuild input '{ip}'" "created_by": f"/bin/sh -c #(nop) osbuild input '{ip}'"
}) })
@ -327,14 +328,16 @@ def create_oci_dir(inputs, output_dir, options):
json.dump({"imageLayoutVersion": "1.0.0"}, f) json.dump({"imageLayoutVersion": "1.0.0"}, f)
def main(inputs, output_dir, options): def main(inputs, output_dir, options, meta):
filename = options["filename"] filename = options["filename"]
source_time = int(meta.get("source-epoch", time.time()))
create_time = datetime.datetime.fromtimestamp(source_time, datetime.timezone.utc)
with tempfile.TemporaryDirectory(dir=output_dir) as tmpdir: with tempfile.TemporaryDirectory(dir=output_dir) as tmpdir:
workdir = os.path.join(tmpdir, "output") workdir = os.path.join(tmpdir, "output")
os.makedirs(workdir) os.makedirs(workdir)
create_oci_dir(inputs, workdir, options) create_oci_dir(inputs, workdir, options, create_time)
command = [ command = [
"tar", "tar",
@ -353,5 +356,5 @@ def main(inputs, output_dir, options):
if __name__ == '__main__': if __name__ == '__main__':
args = osbuild.api.arguments() args = osbuild.api.arguments()
r = main(args["inputs"], args["tree"], args["options"]) r = main(args["inputs"], args["tree"], args["options"], args["meta"])
sys.exit(r) sys.exit(r)