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

---
 1.4/alpine/Dockerfile | 7 +++----
 1.5/alpine/Dockerfile | 7 +++----
 1.6/alpine/Dockerfile | 7 +++----
 1.7/alpine/Dockerfile | 7 +++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/1.4/alpine/Dockerfile b/1.4/alpine/Dockerfile
index 7cee8372..09cdc14c 100644
--- a/1.4/alpine/Dockerfile
+++ b/1.4/alpine/Dockerfile
@@ -32,11 +32,10 @@ RUN set -x \
 	&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
 	&& rm -rf /usr/src/haproxy \
 	&& 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 .haproxy-rundeps $runDeps \
 	&& apk del .build-deps
diff --git a/1.5/alpine/Dockerfile b/1.5/alpine/Dockerfile
index 80601cfe..b83b255f 100644
--- a/1.5/alpine/Dockerfile
+++ b/1.5/alpine/Dockerfile
@@ -32,11 +32,10 @@ RUN set -x \
 	&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \
 	&& rm -rf /usr/src/haproxy \
 	&& 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 .haproxy-rundeps $runDeps \
 	&& apk del .build-deps
diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile
index d2bd3b95..d8d9e650 100644
--- a/1.6/alpine/Dockerfile
+++ b/1.6/alpine/Dockerfile
@@ -67,11 +67,10 @@ RUN set -x \
 	&& rm -rf /usr/src/haproxy \
 	\
 	&& 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 .haproxy-rundeps $runDeps \
 	&& apk del .build-deps
diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile
index fa3a48bd..f9a2b2d6 100644
--- a/1.7/alpine/Dockerfile
+++ b/1.7/alpine/Dockerfile
@@ -67,11 +67,10 @@ RUN set -x \
 	&& rm -rf /usr/src/haproxy \
 	\
 	&& 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 .haproxy-rundeps $runDeps \
 	&& apk del .build-deps