From b86224855225013ae83904a00b34482e5aa23741 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Fri, 22 Sep 2017 14:18:14 -0700
Subject: [PATCH] Adjust scanelf to properly detect runDeps

---
 5.6/alpine/Dockerfile        | 7 +++----
 5.6/fpm/alpine/Dockerfile    | 7 +++----
 5.6/zts/alpine/Dockerfile    | 7 +++----
 7.0/alpine/Dockerfile        | 7 +++----
 7.0/fpm/alpine/Dockerfile    | 7 +++----
 7.0/zts/alpine/Dockerfile    | 7 +++----
 7.1/alpine/Dockerfile        | 7 +++----
 7.1/fpm/alpine/Dockerfile    | 7 +++----
 7.1/zts/alpine/Dockerfile    | 7 +++----
 7.2-rc/alpine/Dockerfile     | 7 +++----
 7.2-rc/fpm/alpine/Dockerfile | 7 +++----
 7.2-rc/zts/alpine/Dockerfile | 7 +++----
 Dockerfile-alpine.template   | 7 +++----
 13 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
index df5768ae7..c69a4ef9a 100644
--- a/5.6/alpine/Dockerfile
+++ b/5.6/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
index 22f5397a4..595a0edf6 100644
--- a/5.6/fpm/alpine/Dockerfile
+++ b/5.6/fpm/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
index c67d24a54..2a6d2490d 100644
--- a/5.6/zts/alpine/Dockerfile
+++ b/5.6/zts/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
index 83fca6ec8..de39fc8a7 100644
--- a/7.0/alpine/Dockerfile
+++ b/7.0/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
index 21cdc2050..876961dec 100644
--- a/7.0/fpm/alpine/Dockerfile
+++ b/7.0/fpm/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
index 9fcdb7220..242f8974f 100644
--- a/7.0/zts/alpine/Dockerfile
+++ b/7.0/zts/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile
index 9e23fd47b..eb4c7bc16 100644
--- a/7.1/alpine/Dockerfile
+++ b/7.1/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile
index b392785d8..bbdee21ed 100644
--- a/7.1/fpm/alpine/Dockerfile
+++ b/7.1/fpm/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.1/zts/alpine/Dockerfile b/7.1/zts/alpine/Dockerfile
index 12aa134b6..99e5b30fb 100644
--- a/7.1/zts/alpine/Dockerfile
+++ b/7.1/zts/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.2-rc/alpine/Dockerfile b/7.2-rc/alpine/Dockerfile
index 647e49a8b..17ddf3d70 100644
--- a/7.2-rc/alpine/Dockerfile
+++ b/7.2-rc/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.2-rc/fpm/alpine/Dockerfile b/7.2-rc/fpm/alpine/Dockerfile
index 6c42b0579..48b7a01ab 100644
--- a/7.2-rc/fpm/alpine/Dockerfile
+++ b/7.2-rc/fpm/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/7.2-rc/zts/alpine/Dockerfile b/7.2-rc/zts/alpine/Dockerfile
index 82ea12786..9bb5264df 100644
--- a/7.2-rc/zts/alpine/Dockerfile
+++ b/7.2-rc/zts/alpine/Dockerfile
@@ -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 \
 	\
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 324c2bbad..226f0390d 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -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 \
 	\