Skip to content

Commit ffd659a

Browse files
tianontianon
committed
Adjust installation order and purge "libpythonXX.a" files
1 parent dcf0dd4 commit ffd659a

File tree

28 files changed

+196
-179
lines changed

28 files changed

+196
-179
lines changed

‎3.5/alpine3.11/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ RUN set -ex \
116116
test_unicode \
117117
' \
118118
&& make install \
119+
&& rm -rf /usr/src/python \
120+
\
121+
&& find /usr/local -depth \
122+
\( \
123+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
124+
-o \
125+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
126+
\) -exec rm -rf '{}' + \
119127
\
120128
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
121129
| tr ',' '\n' \
@@ -124,14 +132,6 @@ RUN set -ex \
124132
| xargs -rt apk add --no-cache --virtual .python-rundeps \
125133
&& apk del --no-network .build-deps \
126134
\
127-
&& find /usr/local -depth \
128-
\( \
129-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
130-
-o \
131-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
132-
\) -exec rm -rf '{}' + \
133-
&& rm -rf /usr/src/python \
134-
\
135135
&& python3 --version
136136

137137
# make some useful symlinks that are expected to exist

‎3.5/alpine3.12/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ RUN set -ex \
116116
test_unicode \
117117
' \
118118
&& make install \
119+
&& rm -rf /usr/src/python \
120+
\
121+
&& find /usr/local -depth \
122+
\( \
123+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
124+
-o \
125+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
126+
\) -exec rm -rf '{}' + \
119127
\
120128
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
121129
| tr ',' '\n' \
@@ -124,14 +132,6 @@ RUN set -ex \
124132
| xargs -rt apk add --no-cache --virtual .python-rundeps \
125133
&& apk del --no-network .build-deps \
126134
\
127-
&& find /usr/local -depth \
128-
\( \
129-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
130-
-o \
131-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
132-
\) -exec rm -rf '{}' + \
133-
&& rm -rf /usr/src/python \
134-
\
135135
&& python3 --version
136136

137137
# make some useful symlinks that are expected to exist

‎3.5/buster/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,16 @@ RUN set -ex \
8484
test_unicode \
8585
' \
8686
&& make install \
87-
&& ldconfig \
87+
&& rm -rf /usr/src/python \
8888
\
8989
&& find /usr/local -depth \
9090
\( \
9191
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
9292
-o \
93-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
93+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
9494
\) -exec rm -rf '{}' + \
95-
&& rm -rf /usr/src/python \
95+
\
96+
&& ldconfig \
9697
\
9798
&& python3 --version
9899

‎3.5/buster/slim/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ RUN set -ex \
108108
test_unicode \
109109
' \
110110
&& make install \
111-
&& ldconfig \
111+
&& rm -rf /usr/src/python \
112+
\
113+
&& find /usr/local -depth \
114+
\( \
115+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116+
-o \
117+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
118+
\) -exec rm -rf '{}' + \
112119
\
113120
&& apt-mark auto '.*' > /dev/null \
114121
&& apt-mark manual $savedAptMark \
@@ -122,13 +129,7 @@ RUN set -ex \
122129
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
123130
&& rm -rf /var/lib/apt/lists/* \
124131
\
125-
&& find /usr/local -depth \
126-
\( \
127-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
128-
-o \
129-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
130-
\) -exec rm -rf '{}' + \
131-
&& rm -rf /usr/src/python \
132+
&& ldconfig \
132133
\
133134
&& python3 --version
134135

‎3.5/stretch/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,16 @@ RUN set -ex \
8484
test_unicode \
8585
' \
8686
&& make install \
87-
&& ldconfig \
87+
&& rm -rf /usr/src/python \
8888
\
8989
&& find /usr/local -depth \
9090
\( \
9191
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
9292
-o \
93-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
93+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
9494
\) -exec rm -rf '{}' + \
95-
&& rm -rf /usr/src/python \
95+
\
96+
&& ldconfig \
9697
\
9798
&& python3 --version
9899

‎3.5/stretch/slim/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ RUN set -ex \
108108
test_unicode \
109109
' \
110110
&& make install \
111-
&& ldconfig \
111+
&& rm -rf /usr/src/python \
112+
\
113+
&& find /usr/local -depth \
114+
\( \
115+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116+
-o \
117+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
118+
\) -exec rm -rf '{}' + \
112119
\
113120
&& apt-mark auto '.*' > /dev/null \
114121
&& apt-mark manual $savedAptMark \
@@ -122,13 +129,7 @@ RUN set -ex \
122129
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
123130
&& rm -rf /var/lib/apt/lists/* \
124131
\
125-
&& find /usr/local -depth \
126-
\( \
127-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
128-
-o \
129-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
130-
\) -exec rm -rf '{}' + \
131-
&& rm -rf /usr/src/python \
132+
&& ldconfig \
132133
\
133134
&& python3 --version
134135

‎3.6/alpine3.11/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,14 @@ RUN set -ex \
118118
test_unicode \
119119
' \
120120
&& make install \
121+
&& rm -rf /usr/src/python \
122+
\
123+
&& find /usr/local -depth \
124+
\( \
125+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
126+
-o \
127+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
128+
\) -exec rm -rf '{}' + \
121129
\
122130
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
123131
| tr ',' '\n' \
@@ -126,14 +134,6 @@ RUN set -ex \
126134
| xargs -rt apk add --no-cache --virtual .python-rundeps \
127135
&& apk del --no-network .build-deps \
128136
\
129-
&& find /usr/local -depth \
130-
\( \
131-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
132-
-o \
133-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
134-
\) -exec rm -rf '{}' + \
135-
&& rm -rf /usr/src/python \
136-
\
137137
&& python3 --version
138138

139139
# make some useful symlinks that are expected to exist

‎3.6/alpine3.12/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,14 @@ RUN set -ex \
118118
test_unicode \
119119
' \
120120
&& make install \
121+
&& rm -rf /usr/src/python \
122+
\
123+
&& find /usr/local -depth \
124+
\( \
125+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
126+
-o \
127+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
128+
\) -exec rm -rf '{}' + \
121129
\
122130
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
123131
| tr ',' '\n' \
@@ -126,14 +134,6 @@ RUN set -ex \
126134
| xargs -rt apk add --no-cache --virtual .python-rundeps \
127135
&& apk del --no-network .build-deps \
128136
\
129-
&& find /usr/local -depth \
130-
\( \
131-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
132-
-o \
133-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
134-
\) -exec rm -rf '{}' + \
135-
&& rm -rf /usr/src/python \
136-
\
137137
&& python3 --version
138138

139139
# make some useful symlinks that are expected to exist

‎3.6/buster/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,16 @@ RUN set -ex \
8484
test_unicode \
8585
' \
8686
&& make install \
87-
&& ldconfig \
87+
&& rm -rf /usr/src/python \
8888
\
8989
&& find /usr/local -depth \
9090
\( \
9191
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
9292
-o \
93-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
93+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
9494
\) -exec rm -rf '{}' + \
95-
&& rm -rf /usr/src/python \
95+
\
96+
&& ldconfig \
9697
\
9798
&& python3 --version
9899

‎3.6/buster/slim/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ RUN set -ex \
108108
test_unicode \
109109
' \
110110
&& make install \
111-
&& ldconfig \
111+
&& rm -rf /usr/src/python \
112+
\
113+
&& find /usr/local -depth \
114+
\( \
115+
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116+
-o \
117+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
118+
\) -exec rm -rf '{}' + \
112119
\
113120
&& apt-mark auto '.*' > /dev/null \
114121
&& apt-mark manual $savedAptMark \
@@ -122,13 +129,7 @@ RUN set -ex \
122129
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
123130
&& rm -rf /var/lib/apt/lists/* \
124131
\
125-
&& find /usr/local -depth \
126-
\( \
127-
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
128-
-o \
129-
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
130-
\) -exec rm -rf '{}' + \
131-
&& rm -rf /usr/src/python \
132+
&& ldconfig \
132133
\
133134
&& python3 --version
134135

0 commit comments

Comments
 (0)