Skip to content

Commit 1d59eb2

Browse files
yosifkityosifkit
committed
Adjust scanelf to properly detect runDeps
1 parent e01eb54 commit 1d59eb2

8 files changed

Lines changed: 24 additions & 32 deletions

File tree

‎2.7/alpine3.4/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,10 @@ RUN set -ex \
6363
&& make install \
6464
\
6565
&& runDeps="$( \
66-
scanelf --needed --nobanner --recursive /usr/local \
67-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
68-
| sort -u \
69-
| xargs -r apk info --installed \
66+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
67+
| tr ',' '\n' \
7068
| sort -u \
69+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
7170
)" \
7271
&& apk add --virtual .python-rundeps $runDeps \
7372
&& apk del .build-deps \

‎2.7/alpine3.6/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,10 @@ RUN set -ex \
6363
&& make install \
6464
\
6565
&& runDeps="$( \
66-
scanelf --needed --nobanner --recursive /usr/local \
67-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
68-
| sort -u \
69-
| xargs -r apk info --installed \
66+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
67+
| tr ',' '\n' \
7068
| sort -u \
69+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
7170
)" \
7271
&& apk add --virtual .python-rundeps $runDeps \
7372
&& apk del .build-deps \

‎3.4/alpine3.4/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ RUN set -ex \
7575
&& make install \
7676
\
7777
&& runDeps="$( \
78-
scanelf --needed --nobanner --recursive /usr/local \
79-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
80-
| sort -u \
81-
| xargs -r apk info --installed \
78+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
79+
| tr ',' '\n' \
8280
| sort -u \
81+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
8382
)" \
8483
&& apk add --virtual .python-rundeps $runDeps \
8584
&& apk del .build-deps \

‎3.5/alpine3.4/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ RUN set -ex \
7575
&& make install \
7676
\
7777
&& runDeps="$( \
78-
scanelf --needed --nobanner --recursive /usr/local \
79-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
80-
| sort -u \
81-
| xargs -r apk info --installed \
78+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
79+
| tr ',' '\n' \
8280
| sort -u \
81+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
8382
)" \
8483
&& apk add --virtual .python-rundeps $runDeps \
8584
&& apk del .build-deps \

‎3.6/alpine3.4/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ RUN set -ex \
7575
&& make install \
7676
\
7777
&& runDeps="$( \
78-
scanelf --needed --nobanner --recursive /usr/local \
79-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
80-
| sort -u \
81-
| xargs -r apk info --installed \
78+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
79+
| tr ',' '\n' \
8280
| sort -u \
81+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
8382
)" \
8483
&& apk add --virtual .python-rundeps $runDeps \
8584
&& apk del .build-deps \

‎3.6/alpine3.6/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ RUN set -ex \
7575
&& make install \
7676
\
7777
&& runDeps="$( \
78-
scanelf --needed --nobanner --recursive /usr/local \
79-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
80-
| sort -u \
81-
| xargs -r apk info --installed \
78+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
79+
| tr ',' '\n' \
8280
| sort -u \
81+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
8382
)" \
8483
&& apk add --virtual .python-rundeps $runDeps \
8584
&& apk del .build-deps \

‎3.7-rc/alpine3.6/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ RUN set -ex \
7575
&& make install \
7676
\
7777
&& runDeps="$( \
78-
scanelf --needed --nobanner --recursive /usr/local \
79-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
80-
| sort -u \
81-
| xargs -r apk info --installed \
78+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
79+
| tr ',' '\n' \
8280
| sort -u \
81+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
8382
)" \
8483
&& apk add --virtual .python-rundeps $runDeps \
8584
&& apk del .build-deps \

‎Dockerfile-alpine.template‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ RUN set -ex \
6969
&& make install \
7070
\
7171
&& runDeps="$( \
72-
scanelf --needed --nobanner --recursive /usr/local \
73-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
74-
| sort -u \
75-
| xargs -r apk info --installed \
72+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
73+
| tr ',' '\n' \
7674
| sort -u \
75+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
7776
)" \
7877
&& apk add --virtual .python-rundeps $runDeps \
7978
&& apk del .build-deps \

0 commit comments

Comments
 (0)