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 redmine #16560

Merged
merged 1 commit into from
Apr 8, 2024
Merged

Update redmine #16560

merged 1 commit into from
Apr 8, 2024

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Apr 8, 2024

Changes:

Changes:

- docker-library/redmine@46c2e72: Merge pull request docker-library/redmine#319 from infosiftr/dpkg-query-search
- docker-library/redmine@2ab2ec3: Fix `dpkg-query --search` to be more specific
@yosifkit yosifkit requested a review from a team as a code owner April 8, 2024 16:40
Copy link

github-actions bot commented Apr 8, 2024

Diff for ed1c593:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0e0a595..4bd9f0e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/redmine.git
 
 Tags: 5.0.8, 5.0, 5.0.8-bookworm, 5.0-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a47825ab3251935beedb9d83ecdc80e78d1ccf28
+GitCommit: 2ab2ec39c515e0f4ef96674751d1363161aa63d4
 Directory: 5.0/bookworm
 
 Tags: 5.0.8-alpine3.18, 5.0-alpine3.18, 5.0.8-alpine, 5.0-alpine
@@ -13,7 +13,7 @@ Directory: 5.0/alpine3.18
 
 Tags: 5.1.2, 5.1, 5, latest, 5.1.2-bookworm, 5.1-bookworm, 5-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 51b7921366b46e2dd5a7f9629b933a3e7a68fdb1
+GitCommit: 2ab2ec39c515e0f4ef96674751d1363161aa63d4
 Directory: 5.1/bookworm
 
 Tags: 5.1.2-alpine3.18, 5.1-alpine3.18, 5-alpine3.18, alpine3.18, 5.1.2-alpine, 5.1-alpine, 5-alpine, alpine
diff --git a/redmine_5.0-bookworm/Dockerfile b/redmine_5.0-bookworm/Dockerfile
index 3774272..93ed8da 100644
--- a/redmine_5.0-bookworm/Dockerfile
+++ b/redmine_5.0-bookworm/Dockerfile
@@ -138,7 +138,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 \
diff --git a/redmine_bookworm/Dockerfile b/redmine_bookworm/Dockerfile
index 7153576..f2f2637 100644
--- a/redmine_bookworm/Dockerfile
+++ b/redmine_bookworm/Dockerfile
@@ -138,7 +138,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 cb2c92d into docker-library:master Apr 8, 2024
9 checks passed
@tianon tianon deleted the redmine branch April 8, 2024 21:06
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