Skip to content

Conversation

@champtar
Copy link
Contributor

@champtar champtar commented May 30, 2025

This was missing for rpm-ostree compose image

Fixes #5409

This was missing for `rpm-ostree compose image`
@openshift-ci
Copy link

openshift-ci bot commented May 30, 2025

Hi @champtar. Thanks for your PR.

I'm waiting for a coreos member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patch!

I'm OK with this though I will note that technically lockfiles are experimental still. Though now that I look we actually ignored that here previously with a stable lockfile verb calling --ex-lockfile. Oh well.

Worth noting that future directions here will (hopefully) come out of rpm-software-management/dnf5#833

@cgwalters
Copy link
Member

/override ci/prow/fcos-e2e

@cgwalters cgwalters enabled auto-merge June 1, 2025 12:52
@openshift-ci
Copy link

openshift-ci bot commented Jun 1, 2025

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/fcos-e2e

In response to this:

/override ci/prow/fcos-e2e

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@cgwalters cgwalters merged commit 02325c7 into coreos:main Jun 1, 2025
17 checks passed
@champtar champtar deleted the compose-image-lockfile branch June 1, 2025 13:03
@champtar
Copy link
Contributor Author

champtar commented Jun 1, 2025

I'll be playing more with OCI images this week, so I might have more patches coming soon.

/// Operate only on cached data, do not access network repositories
offline: bool,

#[clap(long, conflicts_with_all = ["lockfiles", "lockfile_strict"])]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, why do we add a conflict here? They can be used independently.

Copy link
Contributor Author

@champtar champtar Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you write the lock file, you don't read it, so both lockfiles and lockfile_strict make no sense

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output lock file is complete and describes the final package set that was composed.

Input lockfiles constrain the set of possible solutions. They may be complete or incomplete.

See e.g. https://github.com/coreos/fedora-coreos-config/blob/rawhide/manifest-lock.overrides.yaml. That's the only lockfile we feed to rpm-ostree when building rawhide currently.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The combinations of options that make sense:

  1. --write-lockfile-to
  2. --lockfile
  3. --lockfile --lockfile-strict

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, did you see my previous comment?

They're independent and can be used independently or together (and in fact, we use them together in cosa).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can read a partial lock file and write a full lock file, got it now and make sense, will send a patch shortly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

rpm-ostree compose image --write-lockfile

3 participants