Skip to content

Commit e9fcb2e

Browse files
committed
cmd-build-with-buildah: remove temporary stream label hack
Remove the temporary workaround that manually set the `fedora-coreos.stream` label during image builds. This label is now applied directly by rpm-ostree through the build process, making the extra logic unnecessary and simplifying `cmd-build-with-buildah`. See: #4337
1 parent 82410e1 commit e9fcb2e

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/cmd-build-with-buildah

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,6 @@ build_with_buildah() {
167167
--label org.opencontainers.image.source="${source}" \
168168
--label org.opencontainers.image.revision="${commit}"
169169

170-
# XXX: Temporary hack until we have https://github.com/coreos/rpm-ostree/pull/5454
171-
# which would allow us to fold this back into the build process.
172-
# shellcheck source=/dev/null
173-
stream=$(yaml2json "$manifest" /dev/stdout | jq -r '.variables.stream')
174-
if [ "${stream}" != null ]; then
175-
set -- "$@" --label fedora-coreos.stream="$stream" \
176-
--annotation fedora-coreos.stream="$stream"
177-
fi
178-
179170
if [ -d "src/yumrepos" ] && [ -e "src/yumrepos/${variant:-}.repo" ]; then
180171
set -- "$@" --secret id=yumrepos,src="$(realpath "src/yumrepos/$variant.repo")" \
181172
--secret id=contentsets,src="$(realpath src/yumrepos/content_sets.yaml)" \

0 commit comments

Comments
 (0)