Skip to content

Commit bdd937a

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#833 from infosiftr/3.12.0b1
Update to 3.12.0b1 (which removes bundled setuptools)
2 parents f2ed20d + fcb79b9 commit bdd937a

File tree

12 files changed

+69
-68
lines changed

12 files changed

+69
-68
lines changed

‎3.12-rc/alpine3.17/Dockerfile

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

‎3.12-rc/alpine3.18/Dockerfile

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

‎3.12-rc/bullseye/Dockerfile

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

‎3.12-rc/buster/Dockerfile

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

‎3.12-rc/slim-bullseye/Dockerfile

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

‎3.12-rc/slim-buster/Dockerfile

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

‎3.12-rc/windows/windowsservercore-1809/Dockerfile

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

‎3.12-rc/windows/windowsservercore-ltsc2022/Dockerfile

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

‎Dockerfile-linux.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,10 @@ RUN set -eux; \
306306

307307
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
308308
ENV PYTHON_PIP_VERSION {{ .pip.version }}
309+
{{ if .setuptools then ( -}}
309310
# https://github.com/docker-library/python/issues/365
310311
ENV PYTHON_SETUPTOOLS_VERSION {{ .setuptools.version }}
312+
{{ ) else "" end -}}
311313
# https://github.com/pypa/get-pip
312314
ENV PYTHON_GET_PIP_URL {{ .pip.url }}
313315
ENV PYTHON_GET_PIP_SHA256 {{ .pip.sha256 }}
@@ -337,7 +339,9 @@ RUN set -eux; \
337339
--no-cache-dir \
338340
--no-compile \
339341
"pip==$PYTHON_PIP_VERSION" \
342+
{{ if .setuptools then ( -}}
340343
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
344+
{{ ) else "" end -}}
341345
; \
342346
rm -f get-pip.py; \
343347
\

‎Dockerfile-windows.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($en
4646

4747
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
4848
ENV PYTHON_PIP_VERSION {{ .pip.version }}
49+
{{ if .setuptools then ( -}}
4950
# https://github.com/docker-library/python/issues/365
5051
ENV PYTHON_SETUPTOOLS_VERSION {{ .setuptools.version }}
52+
{{ ) else "" end -}}
5153
# https://github.com/pypa/get-pip
5254
ENV PYTHON_GET_PIP_URL {{ .pip.url }}
5355
ENV PYTHON_GET_PIP_SHA256 {{ .pip.sha256 }}
@@ -69,7 +71,9 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
6971
--no-cache-dir \
7072
--no-compile \
7173
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
74+
{{ if .setuptools then ( -}}
7275
('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
76+
{{ ) else "" end -}}
7377
; \
7478
Remove-Item get-pip.py -Force; \
7579
\

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy