Simplify versioning
The versioning here was originally inherited from the Fedora CoreOS configuration. However...the version numbering was always overridden by coreos-assembler, so it wasn't actually used there! Conceptually there are two things here: - OS version - Arbitrary date stamp For the "OS version"...well, the closest thing we have actually to "version of set of RPMs" is a compose today, which is expressed in a distinct label already - at least for CentOS and RHEL. For Fedora of course post-branching there are no "composes" as such but just a set of floating RPMs post-release. We have the "arbitrary date stamp" in the container image build time already - and tooling like bootc and rpm-ostree show both the version and the build time. Let's significantly simplify our version numbers by just going to "OS version". This especially fixes the bug that we weren't setting `releasever` anymore which just broke the version anyways. Closes: https://gitlab.com/fedora/bootc/base-images/-/issues/40 Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
parent
e0628d2124
commit
383f528989
2 changed files with 4 additions and 3 deletions
|
|
@ -44,6 +44,10 @@ EORUN
|
||||||
# This pulls in the rootfs generated in the previous step
|
# This pulls in the rootfs generated in the previous step
|
||||||
FROM scratch
|
FROM scratch
|
||||||
COPY --from=builder /target-rootfs/ /
|
COPY --from=builder /target-rootfs/ /
|
||||||
|
# Note in practice this won't be right in a cross build, so we don't
|
||||||
|
# set it here. This placeholder is just to note that it *should* be set
|
||||||
|
# by the larger build system (e.g. Konflux).
|
||||||
|
LABEL org.opencontainers.image.version 43
|
||||||
LABEL containers.bootc 1
|
LABEL containers.bootc 1
|
||||||
# This is an ad-hoc way for us to reference bootc-image-builder in
|
# This is an ad-hoc way for us to reference bootc-image-builder in
|
||||||
# a way that in theory client tooling can inspect and find. Today
|
# a way that in theory client tooling can inspect and find. Today
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,3 @@ check-passwd:
|
||||||
check-groups:
|
check-groups:
|
||||||
type: "file"
|
type: "file"
|
||||||
filename: "group"
|
filename: "group"
|
||||||
|
|
||||||
automatic-version-prefix: "${releasever}.<date:%Y%m%d>"
|
|
||||||
mutate-os-release: "${releasever}"
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue