Add new treefile-apply experimental command
#5274
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Skipping CI for Draft Pull Request. |
jlebon
added a commit
to jlebon/fedora-coreos-config
that referenced
this pull request
Feb 3, 2025
This uses coreos/rpm-ostree#5274 to build FCOS as a derivation of fedora-bootc.
cgwalters
reviewed
Feb 3, 2025
jlebon
force-pushed
the
pr/treefile-apply
branch
from
cb81b87 to
5e697b1
Compare
jlebon
force-pushed
the
pr/treefile-apply
branch
from
5e697b1 to
26f9175
Compare
|
I think we could use a test case for this, should be pretty easy right? Anything else keeping this in draft? |
cgwalters
approved these changes
Feb 6, 2025
jlebon
added a commit
to jlebon/fedora-coreos-config
that referenced
this pull request
Feb 7, 2025
This uses coreos/rpm-ostree#5274 to build FCOS as a derivation of fedora-bootc.
jlebon
force-pushed
the
pr/treefile-apply
branch
from
26f9175 to
b0edb06
Compare
jlebon
force-pushed
the
pr/treefile-apply
branch
from
b0edb06 to
1669f13
Compare
|
Added test, rebased and moved out of draft! There's definitely more to add here, but it's enough for some success. |
We are working towards rebasing FCOS and RHCOS on top of fedora-bootc and rhel-bootc. As one can imagine, we are quite heavily invested in treefiles currently, so being able to keep using what we already have as we transition into becoming a layered build is valuable. Dockerfiles are great of course as the common language used to build container images. But it's not great for implementing complex logic. Add a new `rpm-ostree experimental compose treefile-apply` command which takes a treefile, but applies its directives _live_ in the running environment. So in this model, the business logic in the Dockerfile is kept to a minimum and all the heavy lifting happens via `RUN rpm-ostree compose treefile-apply manifest.yaml`. A very small subset of the treefile spec is actually supported. The goal is _not_ to reimplement everything, but only what is needed and useful in a derivation context. For now, only `packages`, `recommends`, and `postprocess` are supported. More will be added in the future. This code actually started as a Python script in openshift/os, currently used to build the OCP node image: https://github.com/openshift/os/blob/master/scripts/apply-manifest So in fact, the node image (which in turn is a layered build on top of RHCOS) will also be using this code.
jlebon
force-pushed
the
pr/treefile-apply
branch
from
1669f13 to
057ccd9
Compare
|
Looks like CI failed actually with |
|
CI fix in #5286. I guess let's make it required after that merges? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are working towards rebasing FCOS and RHCOS on top of fedora-bootc
and rhel-bootc. As one can imagine, we are quite heavily invested in
treefiles currently, so being able to keep using what we already have as
we transition into becoming a layered build is valuable.
Dockerfiles are great of course as the common language used to build
container images. But it's not great for implementing complex logic.
Add a new
rpm-ostree experimental compose treefile-applycommandwhich takes a treefile, but applies its directives live in the running
environment.
So in this model, the business logic in the Dockerfile is kept to a
minimum and all the heavy lifting happens via
RUN rpm-ostree compose treefile-apply manifest.yaml.A very small subset of the treefile spec is actually supported. The goal
is not to reimplement everything, but only what is needed and useful
in a derivation context.
This code actually started as a Python script in openshift/os, currently
used to build the OCP node image:
https://github.com/openshift/os/blob/master/scripts/apply-manifest
So in fact, the node image (which in turn is a layered build on top of
RHCOS) will also be using this code.