From e16f9b57ab01d9391b2ba3b1351fb3fbd9fc2084 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Fri, 22 Sep 2017 15:21:01 -0700
Subject: [PATCH] Adjust scanelf to ignore local libs
Signed-off-by: Konstantin Pavlov <thresh@nginx.com>
---
mainline/alpine/Dockerfile | 7 +++----
stable/alpine/Dockerfile | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index fa6c012..cea8c94 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -118,11 +118,10 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& mv /usr/bin/envsubst /tmp/ \
\
&& runDeps="$( \
- scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
- | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
- | sort -u \
- | xargs -r apk info --installed \
+ scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
+ | tr ',' '\n' \
| sort -u \
+ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .nginx-rundeps $runDeps \
&& apk del .build-deps \
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
index 3a4093e..01894ea 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -118,11 +118,10 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& mv /usr/bin/envsubst /tmp/ \
\
&& runDeps="$( \
- scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
- | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
- | sort -u \
- | xargs -r apk info --installed \
+ scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
+ | tr ',' '\n' \
| sort -u \
+ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .nginx-rundeps $runDeps \
&& apk del .build-deps \
--
GitLab