Skip to content

Commit 37a6827

Browse files
RobertDeRosetianon
authored andcommittedOct 18, 2024·
Do not set PROFILE_TASK environment variable
When this is set, the `--enable-optimizations` option is essentially disabled, as the profile task step is skipped. --- Tianon's commit revising note: this also disables optimizations on Alpine entirely, as they fail many tests (which is a known issue upstream AND in Alpine), and the Alpine builds are intended to be optimized for disk size (not speed) anyhow.
1 parent 3540d68 commit 37a6827

File tree

37 files changed

+3
-154
lines changed

37 files changed

+3
-154
lines changed
 

‎3.10/alpine3.19/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/alpine3.20/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/bookworm/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/bullseye/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/slim-bookworm/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/slim-bullseye/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/alpine3.19/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/alpine3.20/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/bookworm/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/bullseye/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/slim-bookworm/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/slim-bullseye/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/alpine3.19/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/alpine3.20/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/bookworm/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/bullseye/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/slim-bookworm/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/slim-bullseye/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/alpine3.19/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/alpine3.20/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/bookworm/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/bullseye/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/slim-bookworm/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/slim-bullseye/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/alpine3.19/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/alpine3.20/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/bookworm/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/bullseye/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/slim-bookworm/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/slim-bullseye/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/alpine3.19/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/alpine3.20/Dockerfile

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/bookworm/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/bullseye/Dockerfile

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/slim-bookworm/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/slim-bullseye/Dockerfile

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile-linux.template

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ RUN set -eux; \
9999
bluez-dev \
100100
bzip2-dev \
101101
dpkg-dev dpkg \
102-
expat-dev \
103102
findutils \
104103
gcc \
105104
gdbm-dev \
@@ -133,7 +132,6 @@ RUN set -eux; \
133132
libbz2-dev \
134133
libc6-dev \
135134
libdb-dev \
136-
libexpat1-dev \
137135
libffi-dev \
138136
libgdbm-dev \
139137
liblzma-dev \
@@ -172,13 +170,11 @@ RUN set -eux; \
172170
--build="$gnuArch" \
173171
--enable-loadable-sqlite-extensions \
174172
{{
175-
# skip optimizations on alpine on riscv64 (except python 3.9)
176-
# only 3.9 completes building on riscv64 with optimizations, 3.10-3.13 all hit the 3 hour limit
177-
if (is_alpine | not) or rcVersion == "3.9" then (
173+
# https://github.com/docker-library/python/pull/980 (fixing PGO runs tests that fail, but shouldn't)
174+
# https://github.com/python/cpython/issues/90548 (alpine failures; not likely to be fixed any time soon)
175+
if is_alpine then "" else (
178176
-}}
179177
--enable-optimizations \
180-
{{ ) else ( -}}
181-
$(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
182178
{{ ) end -}}
183179
--enable-option-checking=fatal \
184180
--enable-shared \
@@ -188,7 +184,6 @@ RUN set -eux; \
188184
-}}
189185
--with-lto \
190186
{{ ) end -}}
191-
--with-system-expat \
192187
--with-ensurepip \
193188
; \
194189
nproc="$(nproc)"; \
@@ -206,15 +201,13 @@ RUN set -eux; \
206201
make -j "$nproc" \
207202
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
208203
"LDFLAGS=${LDFLAGS:-}" \
209-
"PROFILE_TASK=${PROFILE_TASK:-}" \
210204
; \
211205
# https://github.com/docker-library/python/issues/784
212206
# prevent accidental usage of a system installed libpython of the same version
213207
rm python; \
214208
make -j "$nproc" \
215209
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
216210
"LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \
217-
"PROFILE_TASK=${PROFILE_TASK:-}" \
218211
python \
219212
; \
220213
make install; \

0 commit comments

Comments
 (0)
Please sign in to comment.