From 9532e6813b3a64a058af3d21526a9c02b59ab2b7 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 22 Sep 2017 14:40:19 -0700 Subject: [PATCH] Adjust scanelf to properly detect runDeps --- 7/jre7-alpine/Dockerfile | 7 +++---- 7/jre8-alpine/Dockerfile | 7 +++---- 8.0/jre7-alpine/Dockerfile | 7 +++---- 8.0/jre8-alpine/Dockerfile | 7 +++---- 8.5/jre8-alpine/Dockerfile | 7 +++---- 9.0/jre8-alpine/Dockerfile | 7 +++---- Dockerfile-alpine.template | 7 +++---- 7 files changed, 21 insertions(+), 28 deletions(-) diff --git a/7/jre7-alpine/Dockerfile b/7/jre7-alpine/Dockerfile index 51c5a320e..8aa68cca4 100644 --- a/7/jre7-alpine/Dockerfile +++ b/7/jre7-alpine/Dockerfile @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \ diff --git a/7/jre8-alpine/Dockerfile b/7/jre8-alpine/Dockerfile index 28f6ad1fe..7d5888758 100644 --- a/7/jre8-alpine/Dockerfile +++ b/7/jre8-alpine/Dockerfile @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \ diff --git a/8.0/jre7-alpine/Dockerfile b/8.0/jre7-alpine/Dockerfile index f7f862bbf..55e5234cc 100644 --- a/8.0/jre7-alpine/Dockerfile +++ b/8.0/jre7-alpine/Dockerfile @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \ diff --git a/8.0/jre8-alpine/Dockerfile b/8.0/jre8-alpine/Dockerfile index f3a0657fe..0cf0dea18 100644 --- a/8.0/jre8-alpine/Dockerfile +++ b/8.0/jre8-alpine/Dockerfile @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \ diff --git a/8.5/jre8-alpine/Dockerfile b/8.5/jre8-alpine/Dockerfile index b0af23346..b03bbe4b1 100644 --- a/8.5/jre8-alpine/Dockerfile +++ b/8.5/jre8-alpine/Dockerfile @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \ diff --git a/9.0/jre8-alpine/Dockerfile b/9.0/jre8-alpine/Dockerfile index 8c36b1e36..162f9865d 100644 --- a/9.0/jre8-alpine/Dockerfile +++ b/9.0/jre8-alpine/Dockerfile @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ae8416774..ddec4cf8d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -76,11 +76,10 @@ RUN set -x \ && make install \ ) \ && runDeps="$( \ - scanelf --needed --nobanner --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .tomcat-native-rundeps $runDeps \ && apk del .fetch-deps .native-build-deps \