diff --git a/3.5/alpine3.11/Dockerfile b/3.5/alpine3.11/Dockerfile index a057ca8ab..68aeacdc3 100644 --- a/3.5/alpine3.11/Dockerfile +++ b/3.5/alpine3.11/Dockerfile @@ -116,6 +116,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -124,14 +132,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.5/alpine3.12/Dockerfile b/3.5/alpine3.12/Dockerfile index 94e1aa7e5..1674a3d1d 100644 --- a/3.5/alpine3.12/Dockerfile +++ b/3.5/alpine3.12/Dockerfile @@ -116,6 +116,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -124,14 +132,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.5/buster/Dockerfile b/3.5/buster/Dockerfile index a1e876a84..39638273f 100644 --- a/3.5/buster/Dockerfile +++ b/3.5/buster/Dockerfile @@ -84,15 +84,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.5/buster/slim/Dockerfile b/3.5/buster/slim/Dockerfile index 6992534a0..0021badc2 100644 --- a/3.5/buster/slim/Dockerfile +++ b/3.5/buster/slim/Dockerfile @@ -108,6 +108,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -122,14 +131,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.5/stretch/Dockerfile b/3.5/stretch/Dockerfile index 4345caab2..3dc49f2e2 100644 --- a/3.5/stretch/Dockerfile +++ b/3.5/stretch/Dockerfile @@ -84,15 +84,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.5/stretch/slim/Dockerfile b/3.5/stretch/slim/Dockerfile index e5e318b36..7cdbb1260 100644 --- a/3.5/stretch/slim/Dockerfile +++ b/3.5/stretch/slim/Dockerfile @@ -108,6 +108,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -122,14 +131,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.6/alpine3.11/Dockerfile b/3.6/alpine3.11/Dockerfile index fcfe30e1b..70441385b 100644 --- a/3.6/alpine3.11/Dockerfile +++ b/3.6/alpine3.11/Dockerfile @@ -118,6 +118,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -126,14 +134,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.6/alpine3.12/Dockerfile b/3.6/alpine3.12/Dockerfile index a3bbf607d..18e7dc859 100644 --- a/3.6/alpine3.12/Dockerfile +++ b/3.6/alpine3.12/Dockerfile @@ -118,6 +118,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -126,14 +134,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.6/buster/Dockerfile b/3.6/buster/Dockerfile index 59281f980..debd13159 100644 --- a/3.6/buster/Dockerfile +++ b/3.6/buster/Dockerfile @@ -84,15 +84,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.6/buster/slim/Dockerfile b/3.6/buster/slim/Dockerfile index 20579de4d..13f095b50 100644 --- a/3.6/buster/slim/Dockerfile +++ b/3.6/buster/slim/Dockerfile @@ -108,6 +108,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -122,14 +131,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile index 1e893c4c2..a6e1ca8e3 100644 --- a/3.6/stretch/Dockerfile +++ b/3.6/stretch/Dockerfile @@ -84,15 +84,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile index b291bef54..0b3e7727e 100644 --- a/3.6/stretch/slim/Dockerfile +++ b/3.6/stretch/slim/Dockerfile @@ -108,6 +108,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -122,14 +131,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.7/alpine3.11/Dockerfile b/3.7/alpine3.11/Dockerfile index 03097609d..6900905e2 100644 --- a/3.7/alpine3.11/Dockerfile +++ b/3.7/alpine3.11/Dockerfile @@ -119,6 +119,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -127,14 +135,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.7/alpine3.12/Dockerfile b/3.7/alpine3.12/Dockerfile index dcaacb662..19de088d8 100644 --- a/3.7/alpine3.12/Dockerfile +++ b/3.7/alpine3.12/Dockerfile @@ -119,6 +119,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -127,14 +135,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.7/buster/Dockerfile b/3.7/buster/Dockerfile index 318b19a4f..4db0ecdb6 100644 --- a/3.7/buster/Dockerfile +++ b/3.7/buster/Dockerfile @@ -85,15 +85,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.7/buster/slim/Dockerfile b/3.7/buster/slim/Dockerfile index 630ad6a93..8b461afbe 100644 --- a/3.7/buster/slim/Dockerfile +++ b/3.7/buster/slim/Dockerfile @@ -109,6 +109,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -123,14 +132,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.7/stretch/Dockerfile b/3.7/stretch/Dockerfile index 531e94907..82e472062 100644 --- a/3.7/stretch/Dockerfile +++ b/3.7/stretch/Dockerfile @@ -85,15 +85,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile index 1792522f1..f7444f6bc 100644 --- a/3.7/stretch/slim/Dockerfile +++ b/3.7/stretch/slim/Dockerfile @@ -109,6 +109,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -123,14 +132,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.8/alpine3.11/Dockerfile b/3.8/alpine3.11/Dockerfile index a32e1e2cf..92fd497aa 100644 --- a/3.8/alpine3.11/Dockerfile +++ b/3.8/alpine3.11/Dockerfile @@ -83,6 +83,14 @@ RUN set -ex \ EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \ LDFLAGS="-Wl,--strip-all" \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -91,14 +99,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.8/alpine3.12/Dockerfile b/3.8/alpine3.12/Dockerfile index 58675ce2b..d669ff9c0 100644 --- a/3.8/alpine3.12/Dockerfile +++ b/3.8/alpine3.12/Dockerfile @@ -83,6 +83,14 @@ RUN set -ex \ EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \ LDFLAGS="-Wl,--strip-all" \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -91,14 +99,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.8/buster/Dockerfile b/3.8/buster/Dockerfile index 81f756734..2a607d831 100644 --- a/3.8/buster/Dockerfile +++ b/3.8/buster/Dockerfile @@ -49,15 +49,16 @@ RUN set -ex \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/3.8/buster/slim/Dockerfile b/3.8/buster/slim/Dockerfile index fbe41bbd6..338dcd178 100644 --- a/3.8/buster/slim/Dockerfile +++ b/3.8/buster/slim/Dockerfile @@ -73,6 +73,15 @@ RUN set -ex \ && make -j "$(nproc)" \ LDFLAGS="-Wl,--strip-all" \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -87,14 +96,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.9-rc/alpine3.11/Dockerfile b/3.9-rc/alpine3.11/Dockerfile index 25be5764c..17a57ba04 100644 --- a/3.9-rc/alpine3.11/Dockerfile +++ b/3.9-rc/alpine3.11/Dockerfile @@ -83,6 +83,13 @@ RUN set -ex \ EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \ LDFLAGS="-Wl,--strip-all" \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -91,14 +98,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.9-rc/alpine3.12/Dockerfile b/3.9-rc/alpine3.12/Dockerfile index 0db0ab4cf..8d695e790 100644 --- a/3.9-rc/alpine3.12/Dockerfile +++ b/3.9-rc/alpine3.12/Dockerfile @@ -83,6 +83,13 @@ RUN set -ex \ EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000" \ LDFLAGS="-Wl,--strip-all" \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -91,14 +98,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/3.9-rc/buster/Dockerfile b/3.9-rc/buster/Dockerfile index 813147b73..057030230 100644 --- a/3.9-rc/buster/Dockerfile +++ b/3.9-rc/buster/Dockerfile @@ -49,15 +49,15 @@ RUN set -ex \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 27ca1d4d2..b387d1928 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -113,6 +113,14 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ \ && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ @@ -121,14 +129,6 @@ RUN set -ex \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk del --no-network .build-deps \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index c91967324..6f0b37388 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -79,15 +79,16 @@ RUN set -ex \ test_unicode \ ' \ && make install \ - && ldconfig \ + && rm -rf /usr/src/python \ \ && find /usr/local -depth \ \( \ \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ + \ + && ldconfig \ \ && python3 --version diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 457f865d6..7c079a426 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -103,6 +103,15 @@ RUN set -ex \ test_unicode \ ' \ && make install \ + && rm -rf /usr/src/python \ + \ + && find /usr/local -depth \ + \( \ + \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ + -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \ + -o \( -type f -a -name 'wininst-*.exe' \) \ + \) -exec rm -rf '{}' + \ + \ && ldconfig \ \ && apt-mark auto '.*' > /dev/null \ @@ -117,14 +126,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ && python3 --version # make some useful symlinks that are expected to exist diff --git a/update.sh b/update.sh index e1965ec8d..779ba90a3 100755 --- a/update.sh +++ b/update.sh @@ -194,5 +194,9 @@ for version in "${versions[@]}"; do # https://github.com/python/cpython/pull/14910 perl -0 -i -p -e "s![^\n]+PROFILE_TASK(='[^']+?')?[^\n]+\n!!gs" "$dir/Dockerfile" fi + if [ "$minor" -ge 9 ]; then + # "wininst-*.exe" is not installed for Unix platforms on Python 3.9+: https://github.com/python/cpython/pull/14511 + sed -ri -e '/wininst/d' "$dir/Dockerfile" + fi done done