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

Read /etc/os-release file when distro information is not present in labels #1347

Conversation

pbusko
Copy link
Contributor

@pbusko pbusko commented Apr 26, 2024

Summary

Related issue: #1336

Release notes


Related

Resolves #1336


Context

@pbusko pbusko requested a review from a team as a code owner April 26, 2024 10:11
@pbusko pbusko force-pushed the fix-conditional-os-release-read branch from c0edb70 to 6caf66e Compare April 26, 2024 10:11
@natalieparellano
Copy link
Member

@pbusko thank you for the PR. It looks like some test expectations need to be updated - LMK if you'd like any help with this.

@pbusko pbusko force-pushed the fix-conditional-os-release-read branch 4 times, most recently from 55221fd to 7afac5a Compare April 30, 2024 13:54
@pbusko
Copy link
Contributor Author

pbusko commented May 2, 2024

@natalieparellano unfortunately the unit tests on windows are failing due to unknown to me reasons and I'm unable to debug it on that platform, seems like the change itself included in the PR does not have any effect on windows?

@pbusko pbusko force-pushed the fix-conditional-os-release-read branch from 7afac5a to e052ecc Compare May 2, 2024 21:03
… labels

Signed-off-by: Pavel Busko <pavel.busko@sap.com>
@pbusko pbusko force-pushed the fix-conditional-os-release-read branch 4 times, most recently from 795b9b4 to 9b8cd1b Compare May 3, 2024 06:29
Signed-off-by: Pavel Busko <pavel.busko@sap.com>
@pbusko pbusko force-pushed the fix-conditional-os-release-read branch from 9b8cd1b to 0fafd09 Compare May 3, 2024 06:29
phase/generator_test.go Outdated Show resolved Hide resolved
phase/generator_test.go Outdated Show resolved Hide resolved
pbusko and others added 2 commits May 6, 2024 20:39
Co-authored-by: Natalie Arellano <narellano@vmware.com>
Signed-off-by: Pavel Busko <busko.pavel@gmail.com>
Co-authored-by: Natalie Arellano <narellano@vmware.com>
Signed-off-by: Pavel Busko <busko.pavel@gmail.com>
@natalieparellano natalieparellano merged commit effdf24 into buildpacks:main May 6, 2024
8 checks passed
natalieparellano added a commit that referenced this pull request May 10, 2024
…t compat

#1347 reads the file when providing target env vars
to buildpacks during detect, but we also need to consider this info when deciding whether or not to run
detect for the buildpack

Signed-off-by: Natalie Arellano <narellano@vmware.com>
natalieparellano added a commit that referenced this pull request May 10, 2024
…t compat (#1352)

* Reorder functions in file

Signed-off-by: Natalie Arellano <narellano@vmware.com>

* Also read distro information from /etc/os-release when checking target compat

#1347 reads the file when providing target env vars
to buildpacks during detect, but we also need to consider this info when deciding whether or not to run
detect for the buildpack

Signed-off-by: Natalie Arellano <narellano@vmware.com>

* Error if we don't find run image OS during analyze

And remove checks for missing OS later in the build, as it should always be there

Signed-off-by: Natalie Arellano <narellano@vmware.com>

---------

Signed-off-by: Natalie Arellano <narellano@vmware.com>
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.

Target distro name/version not derived from /etc/os-release when Docker labels aren't set
3 participants