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

Update httpd #16564

Merged
merged 1 commit into from
Apr 8, 2024
Merged

Update httpd #16564

merged 1 commit into from
Apr 8, 2024

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Apr 8, 2024

Changes:

Changes:

- docker-library/httpd@7b7f8cd: Merge pull request docker-library/httpd#259 from infosiftr/dpkg-query-search
- docker-library/httpd@b1cb5de: Fix `dpkg-query --search` to be more specific
Copy link

github-actions bot commented Apr 8, 2024

Diff for 84606f3:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bfdafad..2251a2e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/httpd.git
 
 Tags: 2.4.59, 2.4, 2, latest, 2.4.59-bookworm, 2.4-bookworm, 2-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 082047ae2f5373e3f542f983a7997b8f957ed518
+GitCommit: b1cb5ded14f70d67aaa987d3267036884a7320ef
 Directory: 2.4
 
 Tags: 2.4.59-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.59-alpine3.19, 2.4-alpine3.19, 2-alpine3.19, alpine3.19
diff --git a/httpd_bookworm/Dockerfile b/httpd_bookworm/Dockerfile
index dbd6d42..371ab0c 100644
--- a/httpd_bookworm/Dockerfile
+++ b/httpd_bookworm/Dockerfile
@@ -215,7 +215,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| 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 \

Relevant Maintainers:

@tianon tianon merged commit 88fc9be into docker-library:master Apr 8, 2024
7 checks passed
@tianon tianon deleted the httpd branch April 8, 2024 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants