diff --git a/2.7/alpine3.4/Dockerfile b/2.7/alpine3.4/Dockerfile index 977e9c91e..0845301ea 100644 --- a/2.7/alpine3.4/Dockerfile +++ b/2.7/alpine3.4/Dockerfile @@ -63,11 +63,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index 161271326..8ab8cacc0 100644 --- a/2.7/alpine3.6/Dockerfile +++ b/2.7/alpine3.6/Dockerfile @@ -63,11 +63,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/3.4/alpine3.4/Dockerfile b/3.4/alpine3.4/Dockerfile index ff946d65c..886c44534 100644 --- a/3.4/alpine3.4/Dockerfile +++ b/3.4/alpine3.4/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/3.5/alpine3.4/Dockerfile b/3.5/alpine3.4/Dockerfile index 9b4535f40..2235ad5e4 100644 --- a/3.5/alpine3.4/Dockerfile +++ b/3.5/alpine3.4/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/3.6/alpine3.4/Dockerfile b/3.6/alpine3.4/Dockerfile index 01e23f2b4..466a834c8 100644 --- a/3.6/alpine3.4/Dockerfile +++ b/3.6/alpine3.4/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/3.6/alpine3.6/Dockerfile b/3.6/alpine3.6/Dockerfile index e6c03e2ed..dfbfeec46 100644 --- a/3.6/alpine3.6/Dockerfile +++ b/3.6/alpine3.6/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/3.7-rc/alpine3.6/Dockerfile b/3.7-rc/alpine3.6/Dockerfile index f0d5f3fa1..699071a36 100644 --- a/3.7-rc/alpine3.6/Dockerfile +++ b/3.7-rc/alpine3.6/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4c8d7e2c9..ba32dd119 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -69,11 +69,10 @@ RUN set -ex \ && make install \ \ && 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 --virtual .python-rundeps $runDeps \ && apk del .build-deps \