Skip to content

Commit 7c79eeb

Browse files
committed
Fix ldd logic for bookworm/usrmerge
1 parent d0c948b commit 7c79eeb

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ RUN set -ex; \
111111
apt-mark auto '.*' > /dev/null; \
112112
apt-mark manual $savedAptMark; \
113113
ldd "$extDir"/*.so \
114-
| awk '/=>/ { print $3 }' \
114+
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
115115
| sort -u \
116-
| xargs -r dpkg-query -S \
116+
| xargs -r dpkg-query --search \
117117
| cut -d: -f1 \
118118
| sort -u \
119119
| xargs -rt apt-mark manual; \

beta/php8.0/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.0/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.1/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.1/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.2/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.2/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.0/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.0/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.1/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.1/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.2/apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/php8.2/fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)