PR#1726: ostree/container: Set version in treefile 'automatic-version-prefix' - pungi

pungi

#1726 ostree/container: Set version in treefile 'automatic-version-prefix'

Merged a year ago by lsedlar. Opened a year ago by siosm.

siosm/pungi master-ostree-container-version into master

ostree/container: Set version in treefile 'automatic-version-prefix'

Timothée Ravier • a year ago

b388c6c

pungi/ostree/container.py

file modified

+1 -1

		`@@ -74,7 +74,7 @@`
		`repos = []`
		`keep_original_sources = True`

		`- update_dict = {}`
		`+ update_dict = {"automatic-version-prefix": self.args.version}`

		`self.treefile = tweak_treeconf(`
		`self.treefile,`

siosm commented a year ago

In the non container path, we're setting the version for the build using
the --add-metadata-string=version=XYZ argument passed to rpm-ostree compose tree ....

The rpm-ostree compose image path does not expose this option yet so
modify the treefile directly as we are already doing it to set the
repos used for the compose.

See: https://github.com/coreos/rpm-ostree/issues/4829
See: https://pagure.io/workstation-ostree-config/pull-request/472
Signed-off-by: Timothée Ravier tim@siosm.fr

rebased onto b388c6c

a year ago

walters commented a year ago

Looks sane to me

lsedlar commented a year ago

Generally +1 to this this from me, but I think there needs to a be an additional minor tweak. The version value doesn't seem to be forwarded to this piece of code. See #1731 for proposed update.

siosm commented a year ago

Thanks, closing this one.

Pull-Request has been closed by siosm

a year ago

lsedlar commented a year ago

Commit 8412890 fixes this pull-request