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

Move to Debian 12 (bookworm) #235

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Conversation

bilhackmac
Copy link
Contributor

No description provided.

2.4/Dockerfile Outdated
Comment on lines 221 to 223
| awk '/=>/ { print $(NF-1) }' \
| sort -u \
| xargs -r basename -a \
Copy link
Member

@tianon tianon Jun 12, 2023

Choose a reason for hiding this comment

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

Similar comment to docker-library/python#822 (comment):

Suggested change
| awk '/=>/ { print $(NF-1) }' \
| sort -u \
| xargs -r basename -a \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \

(I'm happy to take over from here if you'd prefer 👍)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Comment is not available anymore.

I'll try to understand why you wan't to skip shared objects inside /usr/local.

Otherwise rely on base name instead of an absolute path transformed in relative path may be more robust in time. What do you think ?

Copy link
Member

Choose a reason for hiding this comment

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

Doh, sorry - GitHub did us dirty. I've updated the link above to docker-library/python#822 (comment), which might answer your question.

The reason I'd prefer not to rely on basename here and instead be as specific as we can reasonably be while still being generic enough to match both /usr/something and /something is that something like foo.so might match inside other things like man pages, other directories, etc, and the purpose of this code is to only match things installed by packages, and to do so reliably so we can keep the proper library dependencies installed (and only the necessary dependencies), which is also why we should skip any matches in /usr/local (which I don't think we have any of right now, and they'll generally just return nothing in dpkg-query --search, but we might as well exclude them explicitly just to be sure and to put less work on dpkg-query --search).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I update commit in this way

@tianon tianon merged commit 242f3c6 into docker-library:master Jun 14, 2023
3 checks passed
@tianon
Copy link
Member

tianon commented Jun 14, 2023

Thank you! 👍

docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 14, 2023
Changes:

- docker-library/httpd@242f3c6: Merge pull request docker-library/httpd#235 from bilhackmac/master
- docker-library/httpd@c75f0f7: Move to Debian 12 (bookworm)
- docker-library/httpd@84fab6b: Merge pull request docker-library/httpd#236 from infosiftr/bookworm
- docker-library/httpd@c87146e: Update to Debian bookworm
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