Skip to content

Commit e16f9b5

Browse files
yosifkitthresheek
authored andcommitted
Adjust scanelf to ignore local libs
Signed-off-by: Konstantin Pavlov <[email protected]>
1 parent 48a4c53 commit e16f9b5

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

mainline/alpine/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,10 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
118118
&& mv /usr/bin/envsubst /tmp/ \
119119
\
120120
&& runDeps="$( \
121-
scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
122-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
123-
| sort -u \
124-
| xargs -r apk info --installed \
121+
scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
122+
| tr ',' '\n' \
125123
| sort -u \
124+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
126125
)" \
127126
&& apk add --no-cache --virtual .nginx-rundeps $runDeps \
128127
&& apk del .build-deps \

stable/alpine/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,10 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
118118
&& mv /usr/bin/envsubst /tmp/ \
119119
\
120120
&& runDeps="$( \
121-
scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
122-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
123-
| sort -u \
124-
| xargs -r apk info --installed \
121+
scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
122+
| tr ',' '\n' \
125123
| sort -u \
124+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
126125
)" \
127126
&& apk add --no-cache --virtual .nginx-rundeps $runDeps \
128127
&& apk del .build-deps \

0 commit comments

Comments
 (0)