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

ROX-19942: support usr/lib/redhat-release and RHEL Atomic Host release #1263

Merged
merged 1 commit into from
Oct 4, 2023

Conversation

RTann
Copy link
Collaborator

@RTann RTann commented Oct 3, 2023

It is possible an official Red Hat container image has etc/redhat-release as a symlink to usr/lib/redhat-release instead of being a regular file. This PR adds usr/lib/redhat-release as a file to track.

It also updates the etc/os-release support for RHEL/CentOS in case there may be some other case we miss. The update ensures only the major version of the release is returned when reading a RHEL or CentOS namespace from etc/os-release.

@RTann RTann requested review from jvdm, connorgorman, BradLugo, daynewlee, dcaravel and a team October 3, 2023 22:05
@ghost
Copy link

ghost commented Oct 3, 2023

Images are ready for the commit at 45dff4d.

To use the images, use the tag 2.31.x-15-g45dff4dbc1.

@@ -32,11 +32,12 @@ var (
blocklistFilenames = []string{
"etc/alpine-release",
"etc/centos-release",
"usr/lib/centos-release",
"etc/fedora-release",
Copy link
Contributor

Choose a reason for hiding this comment

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

I am wondering about fedora, too, since it's upstream.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We don't support Fedora in Scanner v2, so I considered removing this, but I decided against it because I didn't want to touch anything unrelated to the goal of this PR

@RTann RTann merged commit 4acdcfe into master Oct 4, 2023
2 checks passed
@RTann RTann deleted the ROX-19942 branch October 4, 2023 04:14
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