Fix path to libpython shared-library in python binaries #785
Conversation
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
yosifkit
commented
Jan 13, 2023
Dockerfile-linux.template
Outdated
| {{ ) else "" end -}} | ||
| LDFLAGS="-Wl,--strip-all,-rpath='$\$ORIGIN/../lib'" \ | ||
| {{ ) else ( -}} | ||
| LDFLAGS="-Wl,-rpath='$\$ORIGIN/../lib'" \ |
There was a problem hiding this comment.
\$because of the double quotes in the shell to prevent interpolation$$formaketo not interpret the$O"because it needed the'around the path, but I didn't want='-Wl,-rpath='"'"'$$ORIGIN/../lib'"'"
tianon
reviewed
Jan 13, 2023
Dockerfile-linux.template
Outdated
| @@ -173,8 +173,10 @@ RUN set -eux; \ | |||
| EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \ | |||
| {{ ) else "" end -}} | |||
| {{ if is_slim or is_alpine then ( -}} | |||
| LDFLAGS="-Wl,--strip-all" \ | |||
| {{ ) else "" end -}} | |||
| LDFLAGS="-Wl,--strip-all,-rpath='$\$ORIGIN/../lib'" \ | |||
There was a problem hiding this comment.
Suggested change
| LDFLAGS="-Wl,--strip-all,-rpath='$\$ORIGIN/../lib'" \ | |
| # \$ because of the double quotes in the shell to prevent interpolation | |
| # $$ for make to not interpret the $O | |
| # " because it needed the ' around the path, but I didn't want ='-Wl,-rpath='"'"'$$ORIGIN/../lib'"'" | |
| LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../lib'{{ if is_slim or is_alpine then ",--strip-all" else "" end }}" \ |
(and then dropping the outer if? 👀)
- prevent accidental usage of a system installed libpython of the same version
tianon
approved these changes
Jan 14, 2023
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Jan 17, 2023
Changes: - docker-library/python@2592ad8: Merge pull request docker-library/python#785 from infosiftr/libpython - docker-library/python@0db1a5b: Fix path to libpython shared-library in python binaries
Merged
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.
This makes the lookup for
libpythondependent on where the binary is, so you can do silly things to see that it works:Fixes #784