From 30b3f40a64a8f128f0bff32f7e76eb9bc041cba5 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 22 Sep 2017 14:06:26 -0700 Subject: [PATCH] Adjust scanelf to properly detect runDeps --- 7/fpm-alpine/Dockerfile | 8 +++----- 8.3/fpm-alpine/Dockerfile | 8 +++----- 8.4-rc/fpm-alpine/Dockerfile | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/7/fpm-alpine/Dockerfile b/7/fpm-alpine/Dockerfile index 4f9f7f3f4..2b20039b6 100644 --- a/7/fpm-alpine/Dockerfile +++ b/7/fpm-alpine/Dockerfile @@ -16,12 +16,10 @@ RUN set -ex \ --with-png-dir=/usr/include/ \ && docker-php-ext-install -j "$(nproc)" gd mbstring pdo pdo_mysql pdo_pgsql zip \ && runDeps="$( \ - scanelf --needed --nobanner --recursive \ - /usr/local/lib/php/extensions \ - | 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 .drupal-phpexts-rundeps $runDeps \ && apk del .build-deps diff --git a/8.3/fpm-alpine/Dockerfile b/8.3/fpm-alpine/Dockerfile index 710f8ed8f..4c5e76d6b 100644 --- a/8.3/fpm-alpine/Dockerfile +++ b/8.3/fpm-alpine/Dockerfile @@ -16,12 +16,10 @@ RUN set -ex \ --with-png-dir=/usr/include/ \ && docker-php-ext-install -j "$(nproc)" gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \ && runDeps="$( \ - scanelf --needed --nobanner --recursive \ - /usr/local/lib/php/extensions \ - | 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 .drupal-phpexts-rundeps $runDeps \ && apk del .build-deps diff --git a/8.4-rc/fpm-alpine/Dockerfile b/8.4-rc/fpm-alpine/Dockerfile index c5bb68f46..1c7cc26d5 100644 --- a/8.4-rc/fpm-alpine/Dockerfile +++ b/8.4-rc/fpm-alpine/Dockerfile @@ -16,12 +16,10 @@ RUN set -ex \ --with-png-dir=/usr/include/ \ && docker-php-ext-install -j "$(nproc)" gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \ && runDeps="$( \ - scanelf --needed --nobanner --recursive \ - /usr/local/lib/php/extensions \ - | 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 .drupal-phpexts-rundeps $runDeps \ && apk del .build-deps