Updates from upstream (docker-library/python#311)

Author: JayH5

2.7/alpine3.6/Dockerfile

@@ -7,6 +7,10 @@ ENV PATH /usr/local/bin:$PATH
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV LANG C.UTF-8
 
+# extra dependencies (over what alpine-buildpack-deps already includes)
+RUN apk add --no-cache \
+        tk-dev
+
 ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 ENV PYTHON_VERSION 2.7.15
 
@@ -16,6 +20,7 @@ RUN set -ex \
         && export GNUPGHOME="$(mktemp -d)" \
         && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
         && gpg --batch --verify python.tar.xz.asc python.tar.xz \
+        && { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
         && rm -rf "$GNUPGHOME" python.tar.xz.asc \
         && mkdir -p /usr/src/python \
         && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
@@ -24,9 +29,7 @@ RUN set -ex \
         && apk add --no-cache --virtual .build-deps  \
             coreutils \
             dpkg-dev dpkg \
-            tcl-dev \
-            tk \
-            tk-dev \
+            findutils \
         \
         && cd /usr/src/python \
         && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
@@ -40,14 +43,11 @@ RUN set -ex \
             EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \
         && make install \
         \
-        && runDeps="$( \
-            scanelf --needed --nobanner --recursive /usr/local \
-                | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-                | sort -u \
-                | xargs -r apk info --installed \
+        && find /usr/local -type f -executable -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
+                | tr ',' '\n' \
                 | sort -u \
-        )" \
-        && apk add --virtual .python-rundeps $runDeps \
+                | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+                | xargs -rt apk add --virtual .python-rundeps \
         && apk del .build-deps \
         \
         && find /usr/local -depth \

2.7/alpine3.7/Dockerfile

@@ -7,6 +7,10 @@ ENV PATH /usr/local/bin:$PATH
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV LANG C.UTF-8
 
+# extra dependencies (over what alpine-buildpack-deps already includes)
+RUN apk add --no-cache \
+        tk-dev
+
 ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 ENV PYTHON_VERSION 2.7.15
 
@@ -16,6 +20,7 @@ RUN set -ex \
         && export GNUPGHOME="$(mktemp -d)" \
         && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
         && gpg --batch --verify python.tar.xz.asc python.tar.xz \
+        && { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
         && rm -rf "$GNUPGHOME" python.tar.xz.asc \
         && mkdir -p /usr/src/python \
         && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
@@ -24,11 +29,9 @@ RUN set -ex \
         && apk add --no-cache --virtual .build-deps  \
             coreutils \
             dpkg-dev dpkg \
+            findutils \
             libnsl-dev \
             libtirpc-dev \
-            tcl-dev \
-            tk \
-            tk-dev \
         \
         && cd /usr/src/python \
         && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
@@ -42,14 +45,11 @@ RUN set -ex \
             EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \
         && make install \
         \
-        && runDeps="$( \
-            scanelf --needed --nobanner --recursive /usr/local \
-                | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-                | sort -u \
-                | xargs -r apk info --installed \
+        && find /usr/local -type f -executable -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
+                | tr ',' '\n' \
                 | sort -u \
-        )" \
-        && apk add --virtual .python-rundeps $runDeps \
+                | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+                | xargs -rt apk add --virtual .python-rundeps \
         && apk del .build-deps \
         \
         && find /usr/local -depth \

3.6/alpine3.6/Dockerfile

@@ -7,6 +7,10 @@ ENV PATH /usr/local/bin:$PATH
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV LANG C.UTF-8
 
+# extra dependencies (over what alpine-buildpack-deps already includes)
+RUN apk add --no-cache \
+        tk-dev
+
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
 ENV PYTHON_VERSION 3.6.6
 
@@ -16,6 +20,7 @@ RUN set -ex \
         && export GNUPGHOME="$(mktemp -d)" \
         && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
         && gpg --batch --verify python.tar.xz.asc python.tar.xz \
+        && { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
         && rm -rf "$GNUPGHOME" python.tar.xz.asc \
         && mkdir -p /usr/src/python \
         && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
@@ -24,9 +29,7 @@ RUN set -ex \
         && apk add --no-cache --virtual .build-deps  \
             coreutils \
             dpkg-dev dpkg \
-            tcl-dev \
-            tk \
-            tk-dev \
+            findutils \
         \
         && cd /usr/src/python \
         && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
@@ -43,14 +46,11 @@ RUN set -ex \
             EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \
         && make install \
         \
-        && runDeps="$( \
-            scanelf --needed --nobanner --recursive /usr/local \
-                | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-                | sort -u \
-                | xargs -r apk info --installed \
-                | sort -u \
-        )" \
-        && apk add --virtual .python-rundeps $runDeps \
+        && find /usr/local -type f -executable -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+            | xargs -rt apk add --virtual .python-rundeps \
         && apk del .build-deps \
         \
         && find /usr/local -depth \

3.6/alpine3.7/Dockerfile

@@ -7,6 +7,10 @@ ENV PATH /usr/local/bin:$PATH
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV LANG C.UTF-8
 
+# extra dependencies (over what alpine-buildpack-deps already includes)
+RUN apk add --no-cache \
+        tk-dev
+
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
 ENV PYTHON_VERSION 3.6.6
 
@@ -16,6 +20,7 @@ RUN set -ex \
         && export GNUPGHOME="$(mktemp -d)" \
         && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
         && gpg --batch --verify python.tar.xz.asc python.tar.xz \
+        && { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
         && rm -rf "$GNUPGHOME" python.tar.xz.asc \
         && mkdir -p /usr/src/python \
         && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
@@ -24,11 +29,9 @@ RUN set -ex \
         && apk add --no-cache --virtual .build-deps  \
             coreutils \
             dpkg-dev dpkg \
+            findutils \
             libnsl-dev \
             libtirpc-dev \
-            tcl-dev \
-            tk \
-            tk-dev \
         \
         && cd /usr/src/python \
         && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
@@ -45,14 +48,11 @@ RUN set -ex \
             EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \
         && make install \
         \
-        && runDeps="$( \
-            scanelf --needed --nobanner --recursive /usr/local \
-                | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-                | sort -u \
-                | xargs -r apk info --installed \
-                | sort -u \
-        )" \
-        && apk add --virtual .python-rundeps $runDeps \
+        && find /usr/local -type f -executable -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+            | xargs -rt apk add --virtual .python-rundeps \
         && apk del .build-deps \
         \
         && find /usr/local -depth \