docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-17 13:02:40 +03:00
Code Activity

Merge pull request #344 from infosiftr/scanelf

Browse Source 
Adjust scanelf to properly detect runDeps
This commit is contained in:
Tianon Gravi
2017-09-25 09:22:29 -07:00
committed by GitHub
parent 26a1e84f0e 1089a8971b
commit 6750eda25a
7 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
10/alpine/Dockerfile
View File

@@ -113,11 +113,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

7
9.2/alpine/Dockerfile
View File

@@ -140,11 +140,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

7
9.3/alpine/Dockerfile
View File

@@ -140,11 +140,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

7
9.4/alpine/Dockerfile
View File

@@ -113,11 +113,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

7
9.5/alpine/Dockerfile
View File

@@ -113,11 +113,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

7
9.6/alpine/Dockerfile
View File

@@ -113,11 +113,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

7
Dockerfile-alpine.template
View File

@@ -115,11 +115,10 @@ RUN set -ex \
&& make -C contrib install \ && make -C contrib install \
\ \
&& runDeps="$( \ && runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ | tr ',' '\n' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)" \ )" \
&& apk add --no-cache --virtual .postgresql-rundeps \ && apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \