Add debian trixie/Drop debian bullseye#515
Merged
yosifkit merged 1 commit intodocker-library:masterfrom Aug 11, 2025
Merged
Conversation
tianon
reviewed
Aug 7, 2025
Member
tianon
left a comment
tianon
left a comment
There was a problem hiding this comment.
Nice, thanks for picking this up! Just two tiny nits 👍
versions.sh
Outdated
Comment on lines
86
to
87
| "trixie", | ||
| "bookworm", |
Member
There was a problem hiding this comment.
Indentation here is wrong: 👀
Suggested change
| "trixie", | |
| "bookworm", | |
| "trixie", | |
| "bookworm", |
Contributor
Author
There was a problem hiding this comment.
Editor insisted on using spaces here , oops. Should be ok now
Dockerfile.template
Outdated
Comment on lines
236
to
240
| | xargs -r dpkg-query --search \ | ||
| # diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 | ||
| # diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged | ||
| | grep -v "^diversion by" \ | ||
| | cut -d: -f1 \ |
Member
There was a problem hiding this comment.
I'd prefer to copy the implementation from docker-library/python#1042 instead:
Suggested change
| | xargs -r dpkg-query --search \ | |
| # diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 | |
| # diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged | |
| | grep -v "^diversion by" \ | |
| | cut -d: -f1 \ | |
| | xargs -rt dpkg-query --search \ | |
| # https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) | |
| | awk 'sub(":$", "", $1) { print $1 }' \ |
Contributor
Author
There was a problem hiding this comment.
Switched over. I didn't have a clue what this was doing, so didn't want to copy it over but after a bit of reading up it makes sense now.
For Ruby 3.2 `libreadline-dev` is being installed which causes unwanted output during `dpkg-query --search`: ```sh dpkg-query --search *lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8.2 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.2.usr-is-merged libreadline8t64:amd64: /usr/lib/x86_64-linux-gnu/libreadline.so.8.2 libreadline8t64:amd64: /usr/lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8.2 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.2.usr-is-merged ``` I don't believe there is any way to control this output, so ignore those lines. Doesn't hurt to have this run on other versions, even though there aren't any other relevant packages that are affected.
|
Thank you for picking this up! I was on vacation this week :) |
Closed
|
Released! 🎉 |
yosifkit
approved these changes
Aug 11, 2025
Member
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Aug 12, 2025
Changes: - docker-library/ruby@4a6fd7b: Merge pull request docker-library/ruby#515 from Earlopain/trixie - docker-library/ruby@26c507e: Add debian trixie/Drop debian bullseye
Merged
4 tasks
junojense
pushed a commit
to DDVTECH/docker-image-library
that referenced
this pull request
Dec 3, 2025
Changes: - docker-library/ruby@4a6fd7b: Merge pull request docker-library/ruby#515 from Earlopain/trixie - docker-library/ruby@26c507e: Add debian trixie/Drop debian bullseye
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
4 participants
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.
Same as #514 but fixed for ruby 3.2. Took some stuff from docker-library/python#1042 as well.
For Ruby 3.2
libreadline-devis being installed which causes unwanted output duringdpkg-query --search:dpkg-query --search *lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8.2 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.2.usr-is-merged libreadline8t64:amd64: /usr/lib/x86_64-linux-gnu/libreadline.so.8.2 libreadline8t64:amd64: /usr/lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8.2 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.2.usr-is-mergedI don't believe there is any way to control this output, so just grep it away. Doesn't hurt to have this run on other versions, even though there aren't any other relevant packages that are affected.
Closes #514