Skip to content

Commit 35941ad

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#851 from infosiftr/get-pip-version
Move "get-pip" URL to a separate versions.json section so commits are more clear
2 parents c2c9e9a + 4c8b243 commit 35941ad

File tree

4 files changed

+32
-11
lines changed

4 files changed

+32
-11
lines changed

‎Dockerfile-linux.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ ENV PYTHON_PIP_VERSION {{ .pip.version }}
311311
ENV PYTHON_SETUPTOOLS_VERSION {{ .setuptools.version }}
312312
{{ ) else "" end -}}
313313
# https://github.com/pypa/get-pip
314-
ENV PYTHON_GET_PIP_URL {{ .pip.url }}
315-
ENV PYTHON_GET_PIP_SHA256 {{ .pip.sha256 }}
314+
ENV PYTHON_GET_PIP_URL {{ ."get-pip".url }}
315+
ENV PYTHON_GET_PIP_SHA256 {{ ."get-pip".sha256 }}
316316

317317
RUN set -eux; \
318318
\

‎Dockerfile-windows.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ENV PYTHON_PIP_VERSION {{ .pip.version }}
5151
ENV PYTHON_SETUPTOOLS_VERSION {{ .setuptools.version }}
5252
{{ ) else "" end -}}
5353
# https://github.com/pypa/get-pip
54-
ENV PYTHON_GET_PIP_URL {{ .pip.url }}
55-
ENV PYTHON_GET_PIP_SHA256 {{ .pip.sha256 }}
54+
ENV PYTHON_GET_PIP_URL {{ ."get-pip".url }}
55+
ENV PYTHON_GET_PIP_SHA256 {{ ."get-pip".sha256 }}
5656

5757
RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); \
5858
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \

‎versions.json

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"3.10": {
3-
"pip": {
3+
"get-pip": {
44
"sha256": "221ebd8c2ac62fc2d6e80c60d9674e212c0a468879b7daddb0469570cfa5148f",
55
"url": "https://github.com/pypa/get-pip/raw/12b30d8c229961b6c0892101b365ec185fab7e14/public/get-pip.py",
6+
"version": "https://github.com/pypa/get-pip/commit/12b30d8c229961b6c0892101b365ec185fab7e14"
7+
},
8+
"pip": {
69
"version": "23.0.1"
710
},
811
"setuptools": {
@@ -19,9 +22,12 @@
1922
"version": "3.10.12"
2023
},
2124
"3.11": {
22-
"pip": {
25+
"get-pip": {
2326
"sha256": "221ebd8c2ac62fc2d6e80c60d9674e212c0a468879b7daddb0469570cfa5148f",
2427
"url": "https://github.com/pypa/get-pip/raw/12b30d8c229961b6c0892101b365ec185fab7e14/public/get-pip.py",
28+
"version": "https://github.com/pypa/get-pip/commit/12b30d8c229961b6c0892101b365ec185fab7e14"
29+
},
30+
"pip": {
2531
"version": "23.1.2"
2632
},
2733
"setuptools": {
@@ -40,9 +46,12 @@
4046
"version": "3.11.4"
4147
},
4248
"3.12-rc": {
43-
"pip": {
49+
"get-pip": {
4450
"sha256": "221ebd8c2ac62fc2d6e80c60d9674e212c0a468879b7daddb0469570cfa5148f",
4551
"url": "https://github.com/pypa/get-pip/raw/12b30d8c229961b6c0892101b365ec185fab7e14/public/get-pip.py",
52+
"version": "https://github.com/pypa/get-pip/commit/12b30d8c229961b6c0892101b365ec185fab7e14"
53+
},
54+
"pip": {
4655
"version": "23.1.2"
4756
},
4857
"variants": [
@@ -58,9 +67,12 @@
5867
"version": "3.12.0b4"
5968
},
6069
"3.7": {
61-
"pip": {
70+
"get-pip": {
6271
"sha256": "221ebd8c2ac62fc2d6e80c60d9674e212c0a468879b7daddb0469570cfa5148f",
6372
"url": "https://github.com/pypa/get-pip/raw/12b30d8c229961b6c0892101b365ec185fab7e14/public/get-pip.py",
73+
"version": "https://github.com/pypa/get-pip/commit/12b30d8c229961b6c0892101b365ec185fab7e14"
74+
},
75+
"pip": {
6476
"version": "23.0.1"
6577
},
6678
"setuptools": {
@@ -77,9 +89,12 @@
7789
"version": "3.7.17"
7890
},
7991
"3.8": {
80-
"pip": {
92+
"get-pip": {
8193
"sha256": "221ebd8c2ac62fc2d6e80c60d9674e212c0a468879b7daddb0469570cfa5148f",
8294
"url": "https://github.com/pypa/get-pip/raw/12b30d8c229961b6c0892101b365ec185fab7e14/public/get-pip.py",
95+
"version": "https://github.com/pypa/get-pip/commit/12b30d8c229961b6c0892101b365ec185fab7e14"
96+
},
97+
"pip": {
8398
"version": "23.0.1"
8499
},
85100
"setuptools": {
@@ -96,9 +111,12 @@
96111
"version": "3.8.17"
97112
},
98113
"3.9": {
99-
"pip": {
114+
"get-pip": {
100115
"sha256": "221ebd8c2ac62fc2d6e80c60d9674e212c0a468879b7daddb0469570cfa5148f",
101116
"url": "https://github.com/pypa/get-pip/raw/12b30d8c229961b6c0892101b365ec185fab7e14/public/get-pip.py",
117+
"version": "https://github.com/pypa/get-pip/commit/12b30d8c229961b6c0892101b365ec185fab7e14"
118+
},
119+
"pip": {
102120
"version": "23.0.1"
103121
},
104122
"setuptools": {

‎versions.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ getPipCommit="$(curl -fsSL 'https://github.com/pypa/get-pip/commits/main/public/
2121
getPipCommit="$(awk <<<"$getPipCommit" -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')"
2222
getPipUrl="https://github.com/pypa/get-pip/raw/$getPipCommit/public/get-pip.py"
2323
getPipSha256="$(curl -fsSL "$getPipUrl" | sha256sum | cut -d' ' -f1)"
24-
export getPipUrl getPipSha256
24+
export getPipCommit getPipUrl getPipSha256
2525

2626
has_linux_version() {
2727
local dir="$1"; shift
@@ -179,6 +179,9 @@ for version in "${versions[@]}"; do
179179
version: env.fullVersion,
180180
pip: {
181181
version: env.pipVersion,
182+
},
183+
"get-pip": {
184+
version: "https://github.com/pypa/get-pip/commit/\(env.getPipCommit)",
182185
url: env.getPipUrl,
183186
sha256: env.getPipSha256,
184187
},

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