ROX-30918, ROX-31049: Update labels, fix docker mediaType#2568
Merged
ROX-30918, ROX-31049: Update labels, fix docker mediaType#2568
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #2568 +/- ##
=======================================
Coverage 28.79% 28.79%
=======================================
Files 95 95
Lines 5796 5796
Branches 2551 2551
=======================================
Hits 1669 1669
Misses 3409 3409
Partials 718 718
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Contributor
Author
|
/retest collector-on-push |
6 tasks
Contributor
Author
|
/retest collector-on-push |
4 tasks
e9d55d7 to
b2819bf
Compare
preserving order found in stackrox/stackrox, see https://github.com/stackrox/stackrox/blob/master/image/rhel/konflux.Dockerfile The separation existed for collector/collector-slim but that's not the thing any more and so merging `LABEL`-s.
as suggested in #2453
via `BUILD_TIMESTAMP` param.
b2819bf to
e179ea7
Compare
Contributor
Author
|
Adapted check script: #!/usr/bin/env bash
set -euo pipefail
tag="3.23.x-9-ge179ea73b7-fast"
parent="quay.io/rhacs-eng"
repos=(release-collector)
arch_suffixes=(amd64 s390x ppc64le arm64)
echo " >>> Checking mediaType on indexes"
for repo in "${repos[@]}"; do
index="${parent}/${repo}:${tag}"
echo " >>> on ${index}"
skopeo inspect --raw "docker://${index}" | jq | grep mediaType
done
echo " >>> Checking mediaType on images"
for repo in "${repos[@]}"; do
index="${parent}/${repo}:${tag}"
for arch in "${arch_suffixes[@]}"; do
image="${index}-${arch}"
echo " >>> on ${image}"
skopeo inspect --raw "docker://${image}" | jq | grep mediaType
done
done
echo " >>> Checking labels on images"
for repo in "${repos[@]}"; do
index="${parent}/${repo}:${tag}"
for arch in "${arch_suffixes[@]}"; do
image="${index}-${arch}"
echo " >>> on ${image}"
skopeo inspect --no-tags "docker://${image}" | grep -E '"(cpe|name|org.opencontainers.image.created)"'
done
done |
tommartensen
approved these changes
Oct 15, 2025
msugakov
added a commit
that referenced
this pull request
Oct 15, 2025
This was referenced Oct 15, 2025
kurlov
pushed a commit
that referenced
this pull request
Oct 15, 2025
msugakov
added a commit
that referenced
this pull request
Oct 16, 2025
1 task
msugakov
added a commit
that referenced
this pull request
Oct 17, 2025
1 task
This file contains hidden or 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
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.
Description
See stackrox/scanner#2300.
Checklist
[ ] Updated documentation accordinglyAutomated testing
No change.
Testing Performed
Checked the results with my script, see below.