fix(dockerutil): GetImageMetadata: detect correct usr lib dir based on os release #127
Conversation
This file contains 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
deansheather
reviewed
Mar 5, 2025
johnstcn
commented
Mar 5, 2025
Comment on lines
+24
to
+26
| if val, ok := os.LookupEnv("CODER_TEST_INTEGRATION"); !ok || val != "1" { | ||
| t.Skip("integration tests are skipped unless CODER_TEST_INTEGRATION=1") | ||
| } |
There was a problem hiding this comment.
review: moved to this method of skipping the tests, as the build directives were annoying
johnstcn
commented
Mar 5, 2025
johnstcn
changed the title
deansheather
reviewed
Mar 5, 2025
johnstcn
commented
Mar 5, 2025
johnstcn
force-pushed
the
cj/dockerutil-usrlibdir
branch
from
8b92093 to
5d58aeb
Compare
|
Rebased on main with the correct author and GPG signature. |
johnstcn
commented
Mar 6, 2025
| @@ -209,7 +209,7 @@ jobs: | |||
| category: "Trivy" | |||
|
|
|||
| - name: Upload Trivy scan results as an artifact | |||
| uses: actions/upload-artifact@v3 | |||
| uses: actions/upload-artifact@v4 | |||
There was a problem hiding this comment.
review: required for CI to pass
dannykopping
approved these changes
Mar 6, 2025
deansheather
approved these changes
Mar 6, 2025
This was referenced Mar 6, 2025
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.
Updates #126
We had been mounting GPU libraries into the destination
/usr/libinside the inner container by default. This doesn't hold true for Redhat-based distributions, who use/usr/lib64instead./etc/os-releaseinside the inner containerCODER_USR_LIB_DIRif not specified.CODER_INNER_USR_LIB_DIR.