Skip to content

cmd-build-with-buildah: remove temporary stream label hack #4351

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cmd-build-with-buildah: remove temporary stream label hack #4351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cmd-build-with-buildah
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,6 @@ build_with_buildah() {
--label org.opencontainers.image.source="${source}" \
--label org.opencontainers.image.revision="${commit}"

# XXX: Temporary hack until we have https://github.com/coreos/rpm-ostree/pull/5454
# which would allow us to fold this back into the build process.
# shellcheck source=/dev/null
stream=$(yaml2json "$manifest" /dev/stdout | jq -r '.variables.stream')
if [ "${stream}" != null ]; then
set -- "$@" --label fedora-coreos.stream="$stream" \
--annotation fedora-coreos.stream="$stream"
Copy link
Member

@jbtrystram jbtrystram Nov 4, 2025

Choose a reason for hiding this comment

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

mhmm is the annotation used somewhere ? we must be careful not to break anything relying on it

Copy link
Member

@dustymabe dustymabe Nov 5, 2025

Choose a reason for hiding this comment

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

in other words, as part of this and coreos/fedora-coreos-config#3867 we are retaining the label, but losing the annotation, correct?

Copy link
Contributor Author

@Roshan-R Roshan-R Nov 5, 2025

Choose a reason for hiding this comment

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

in other words, as part of this and coreos/fedora-coreos-config#3867 we are retaining the label, but losing the annotation, correct?

Yes, Exactly

Copy link
Member

@dustymabe dustymabe Nov 5, 2025

Choose a reason for hiding this comment

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

and I'm guessing we need to do something like https://github.com/coreos/rpm-ostree/pull/5454/files but for --annotation if we wanted to keep it, which is probably what we should do

fi

if [ -d "src/yumrepos" ] && [ -e "src/yumrepos/${variant:-}.repo" ]; then
set -- "$@" --secret id=yumrepos,src="$(realpath "src/yumrepos/$variant.repo")" \
--secret id=contentsets,src="$(realpath src/yumrepos/content_sets.yaml)" \
Expand Down
Loading