Skip to content

Commit 86c04e9

Browse files
tianontianon
committed
Pin pip to 21.2.x and setuptools to 57.x
1 parent aaacfe2 commit 86c04e9

File tree

41 files changed

+170
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+170
-2
lines changed

‎3.10-rc/alpine3.13/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ RUN cd /usr/local/bin \
115115

116116
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
117117
ENV PYTHON_PIP_VERSION 21.2.4
118+
# https://github.com/docker-library/python/issues/365
119+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
118120
# https://github.com/pypa/get-pip
119121
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
120122
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -128,6 +130,7 @@ RUN set -ex; \
128130
--disable-pip-version-check \
129131
--no-cache-dir \
130132
"pip==$PYTHON_PIP_VERSION" \
133+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
131134
; \
132135
pip --version; \
133136
\

‎3.10-rc/alpine3.14/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ RUN cd /usr/local/bin \
115115

116116
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
117117
ENV PYTHON_PIP_VERSION 21.2.4
118+
# https://github.com/docker-library/python/issues/365
119+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
118120
# https://github.com/pypa/get-pip
119121
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
120122
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -128,6 +130,7 @@ RUN set -ex; \
128130
--disable-pip-version-check \
129131
--no-cache-dir \
130132
"pip==$PYTHON_PIP_VERSION" \
133+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
131134
; \
132135
pip --version; \
133136
\

‎3.10-rc/bullseye/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ RUN cd /usr/local/bin \
7070

7171
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
7272
ENV PYTHON_PIP_VERSION 21.2.4
73+
# https://github.com/docker-library/python/issues/365
74+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
7375
# https://github.com/pypa/get-pip
7476
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
7577
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -83,6 +85,7 @@ RUN set -ex; \
8385
--disable-pip-version-check \
8486
--no-cache-dir \
8587
"pip==$PYTHON_PIP_VERSION" \
88+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
8689
; \
8790
pip --version; \
8891
\

‎3.10-rc/bullseye/slim/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ RUN cd /usr/local/bin \
110110

111111
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
112112
ENV PYTHON_PIP_VERSION 21.2.4
113+
# https://github.com/docker-library/python/issues/365
114+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
113115
# https://github.com/pypa/get-pip
114116
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
115117
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -132,6 +134,7 @@ RUN set -ex; \
132134
--disable-pip-version-check \
133135
--no-cache-dir \
134136
"pip==$PYTHON_PIP_VERSION" \
137+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
135138
; \
136139
pip --version; \
137140
\

‎3.10-rc/buster/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ RUN cd /usr/local/bin \
7070

7171
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
7272
ENV PYTHON_PIP_VERSION 21.2.4
73+
# https://github.com/docker-library/python/issues/365
74+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
7375
# https://github.com/pypa/get-pip
7476
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
7577
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -83,6 +85,7 @@ RUN set -ex; \
8385
--disable-pip-version-check \
8486
--no-cache-dir \
8587
"pip==$PYTHON_PIP_VERSION" \
88+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
8689
; \
8790
pip --version; \
8891
\

‎3.10-rc/buster/slim/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ RUN cd /usr/local/bin \
110110

111111
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
112112
ENV PYTHON_PIP_VERSION 21.2.4
113+
# https://github.com/docker-library/python/issues/365
114+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
113115
# https://github.com/pypa/get-pip
114116
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
115117
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -132,6 +134,7 @@ RUN set -ex; \
132134
--disable-pip-version-check \
133135
--no-cache-dir \
134136
"pip==$PYTHON_PIP_VERSION" \
137+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
135138
; \
136139
pip --version; \
137140
\

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
5353

5454
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
5555
ENV PYTHON_PIP_VERSION 21.2.4
56+
# https://github.com/docker-library/python/issues/365
57+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
5658
# https://github.com/pypa/get-pip
5759
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
5860
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
7173
--disable-pip-version-check \
7274
--no-cache-dir \
7375
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
76+
('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
7477
; \
7578
Remove-Item get-pip.py -Force; \
7679
\

‎3.10-rc/windows/windowsservercore-ltsc2016/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
5353

5454
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
5555
ENV PYTHON_PIP_VERSION 21.2.4
56+
# https://github.com/docker-library/python/issues/365
57+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
5658
# https://github.com/pypa/get-pip
5759
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
5860
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
7173
--disable-pip-version-check \
7274
--no-cache-dir \
7375
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
76+
('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
7477
; \
7578
Remove-Item get-pip.py -Force; \
7679
\

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
5353

5454
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
5555
ENV PYTHON_PIP_VERSION 21.2.4
56+
# https://github.com/docker-library/python/issues/365
57+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
5658
# https://github.com/pypa/get-pip
5759
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
5860
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
7173
--disable-pip-version-check \
7274
--no-cache-dir \
7375
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
76+
('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
7477
; \
7578
Remove-Item get-pip.py -Force; \
7679
\

‎3.6/alpine3.13/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ RUN cd /usr/local/bin \
149149

150150
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
151151
ENV PYTHON_PIP_VERSION 21.2.4
152+
# https://github.com/docker-library/python/issues/365
153+
ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
152154
# https://github.com/pypa/get-pip
153155
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py
154156
ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b
@@ -162,6 +164,7 @@ RUN set -ex; \
162164
--disable-pip-version-check \
163165
--no-cache-dir \
164166
"pip==$PYTHON_PIP_VERSION" \
167+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
165168
; \
166169
pip --version; \
167170
\

0 commit comments

Comments
 (0)