Skip to content

Commit

Permalink
Merge pull request #500 from infosiftr/scanelf
Browse files Browse the repository at this point in the history 
Adjust scanelf to properly detect runDeps
  • Loading branch information
@tianon
tianon authored Sep 25, 2017
2 parents 6f86f0f + b862248 commit 7c45279
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 52 deletions.
7 changes: 3 additions & 4 deletions 5.6/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 5.6/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 5.6/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.0/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.0/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.0/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.1/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.1/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.1/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.2-rc/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.2-rc/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions 7.2-rc/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,10 @@ RUN set -xe \
&& docker-php-source delete \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \
&& apk add --no-cache --virtual .php-rundeps $runDeps \
\
Expand Down

0 comments on commit 7c45279

Please sign in to comment.