Skip to content

Commit 4b37165

Browse files
yosifkityosifkit
authored
Merge pull request #144 from infosiftr/3.6.0a4
Update to 3.6.0a4 (and add "--force-reinstall" to pip)
2 parents 9286f02 + 855b85c commit 4b37165

File tree

24 files changed

+142
-28
lines changed

24 files changed

+142
-28
lines changed

‎2.7/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ RUN set -ex \
4747
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
4848
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
4949
&& rm /tmp/get-pip.py \
50-
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
50+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
51+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
52+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
53+
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
54+
# then we use "pip list" to ensure we don't have more than one pip version installed
55+
# https://github.com/docker-library/python/pull/100
5156
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5257
\
5358
&& find /usr/local -depth \

‎2.7/alpine/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,12 @@ RUN set -ex \
6464
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
6565
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
6666
&& rm /tmp/get-pip.py \
67-
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
67+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
68+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
69+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
70+
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
71+
# then we use "pip list" to ensure we don't have more than one pip version installed
72+
# https://github.com/docker-library/python/pull/100
6873
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6974
\
7075
&& find /usr/local -depth \

‎2.7/slim/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ RUN set -ex \
6060
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
6161
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
6262
&& rm /tmp/get-pip.py \
63-
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
63+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
64+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
65+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
66+
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
67+
# then we use "pip list" to ensure we don't have more than one pip version installed
68+
# https://github.com/docker-library/python/pull/100
6469
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6570
\
6671
&& find /usr/local -depth \

‎2.7/wheezy/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ RUN set -ex \
4747
&& wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
4848
&& python2 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
4949
&& rm /tmp/get-pip.py \
50-
&& pip install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
50+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
51+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
52+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
53+
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
54+
# then we use "pip list" to ensure we don't have more than one pip version installed
55+
# https://github.com/docker-library/python/pull/100
5156
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5257
\
5358
&& find /usr/local -depth \

‎3.3/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ RUN set -ex \
5656
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
5757
&& rm /tmp/get-pip.py \
5858
; fi \
59-
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
59+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
60+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
61+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
62+
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
63+
# then we use "pip list" to ensure we don't have more than one pip version installed
64+
# https://github.com/docker-library/python/pull/100
6065
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6166
\
6267
&& find /usr/local -depth \

‎3.3/alpine/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ RUN set -ex \
7373
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
7474
&& rm /tmp/get-pip.py \
7575
; fi \
76-
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
76+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
77+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
78+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
79+
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
80+
# then we use "pip list" to ensure we don't have more than one pip version installed
81+
# https://github.com/docker-library/python/pull/100
7782
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7883
\
7984
&& find /usr/local -depth \

‎3.3/slim/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ RUN set -ex \
6969
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
7070
&& rm /tmp/get-pip.py \
7171
; fi \
72-
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
72+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
73+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
74+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
75+
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
76+
# then we use "pip list" to ensure we don't have more than one pip version installed
77+
# https://github.com/docker-library/python/pull/100
7378
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7479
\
7580
&& find /usr/local -depth \

‎3.3/wheezy/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ RUN set -ex \
5656
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
5757
&& rm /tmp/get-pip.py \
5858
; fi \
59-
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
59+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
60+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
61+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
62+
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
63+
# then we use "pip list" to ensure we don't have more than one pip version installed
64+
# https://github.com/docker-library/python/pull/100
6065
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6166
\
6267
&& find /usr/local -depth \

‎3.4/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ RUN set -ex \
5656
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
5757
&& rm /tmp/get-pip.py \
5858
; fi \
59-
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
59+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
60+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
61+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
62+
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
63+
# then we use "pip list" to ensure we don't have more than one pip version installed
64+
# https://github.com/docker-library/python/pull/100
6065
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6166
\
6267
&& find /usr/local -depth \

‎3.4/alpine/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ RUN set -ex \
7373
&& python3 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
7474
&& rm /tmp/get-pip.py \
7575
; fi \
76-
&& pip3 install --no-cache-dir --upgrade "pip==$PYTHON_PIP_VERSION" \
76+
# we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
77+
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
78+
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
79+
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
80+
# then we use "pip list" to ensure we don't have more than one pip version installed
81+
# https://github.com/docker-library/python/pull/100
7782
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7883
\
7984
&& find /usr/local -depth \

0 commit comments

Comments
 (0)