Merge pull request #834 from infosiftr/fix-ldd

Fix ldd logic for bookworm/usrmerge
docker-library · Jun 20, 2023 · 78a4952 · 78a4952
2 parents d0c948b + 7c79eeb
commit 78a4952
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 26 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -111,9 +111,9 @@ RUN set -ex; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$extDir"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \

diff --git a/beta/php8.0/apache/Dockerfile b/beta/php8.0/apache/Dockerfile
diff --git a/beta/php8.0/fpm/Dockerfile b/beta/php8.0/fpm/Dockerfile
diff --git a/beta/php8.1/apache/Dockerfile b/beta/php8.1/apache/Dockerfile
diff --git a/beta/php8.1/fpm/Dockerfile b/beta/php8.1/fpm/Dockerfile
diff --git a/beta/php8.2/apache/Dockerfile b/beta/php8.2/apache/Dockerfile
diff --git a/beta/php8.2/fpm/Dockerfile b/beta/php8.2/fpm/Dockerfile
diff --git a/latest/php8.0/apache/Dockerfile b/latest/php8.0/apache/Dockerfile
diff --git a/latest/php8.0/fpm/Dockerfile b/latest/php8.0/fpm/Dockerfile
diff --git a/latest/php8.1/apache/Dockerfile b/latest/php8.1/apache/Dockerfile
diff --git a/latest/php8.1/fpm/Dockerfile b/latest/php8.1/fpm/Dockerfile
diff --git a/latest/php8.2/apache/Dockerfile b/latest/php8.2/apache/Dockerfile
diff --git a/latest/php8.2/fpm/Dockerfile b/latest/php8.2/fpm/Dockerfile