Merge pull request #892 from infosiftr/dpkg-query-search

Fix `dpkg-query --search` to be more specific
docker-library · Apr 5, 2024 · 43d8dbc · 43d8dbc
2 parents 8bd179f + 2007d5d
commit 43d8dbc
Show file tree

Hide file tree

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

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/beta/php8.3/apache/Dockerfile b/beta/php8.3/apache/Dockerfile
diff --git a/beta/php8.3/fpm/Dockerfile b/beta/php8.3/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
diff --git a/latest/php8.3/apache/Dockerfile b/latest/php8.3/apache/Dockerfile
diff --git a/latest/php8.3/fpm/Dockerfile b/latest/php8.3/fpm/Dockerfile