Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Add fedora-coreos.stream to image labels #3214

Merged
merged 2 commits into from
Jan 11, 2023

Conversation

cgwalters
Copy link
Member

build: Drop reference to ostree container encapsulate

We aren't going to use this.


build: Add fedora-coreos.stream to image labels

From discussion in coreos/zincati#878
related to coreos/fedora-coreos-tracker#1263


cgwalters added a commit to cgwalters/ostree-rs-ext that referenced this pull request Nov 21, 2022
This is to aid coreos/coreos-assembler#3214
which is trying to inject the metadata key `fedora-coreos.stream`
into the container image.  However, this value will only be
present in Fedora derivatives, and not RHEL/CentOS.

Add support for copying a key only if present, instead of
erroring if it's missing.
cgwalters added a commit to cgwalters/ostree-rs-ext that referenced this pull request Nov 21, 2022
This is to aid coreos/coreos-assembler#3214
which is trying to inject the metadata key `fedora-coreos.stream`
into the container image.  However, this value will only be
present in Fedora derivatives, and not RHEL/CentOS.

Add support for copying a key only if present, instead of
erroring if it's missing.
@cgwalters
Copy link
Member Author

OK, did ostreedev/ostree-rs-ext#415 to help this.

jlebon
jlebon previously approved these changes Nov 22, 2022
src/cmd-build Outdated Show resolved Hide resolved
@cgwalters cgwalters added the hold-for-external Needs an external dependency to change label Dec 6, 2022
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request Dec 14, 2022
I meant to do this after landing the ostree-ext updates in order
to push forward coreos/coreos-assembler#3214
@cgwalters
Copy link
Member Author

OK, a month later now, I think we can depend on the newer rpm-ostree.

@jlebon jlebon removed the hold-for-external Needs an external dependency to change label Jan 11, 2023
@jlebon jlebon enabled auto-merge (rebase) January 11, 2023 19:05
@jlebon jlebon merged commit c38daf9 into coreos:main Jan 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants