Skip to content

Commit 2416b6b

Browse files
committed
Pre-empt pip list format change
Following discussion in docker-library/python#187 it was decided that rather than refactor this check, it should be removed. This was because the original error condition it was designed to prevent could not be reproduced. This is done with the understanding that it may need to be revisited if any recurrance (of docker-library/python#100) is encountered in future.
1 parent 259db25 commit 2416b6b

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

Dockerfile-alpine.template

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ RUN set -ex \
7272
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
7373
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
7474
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
75-
# then we use "pip list" to ensure we don't have more than one pip version installed
76-
# https://github.com/docker-library/python/pull/100
77-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7875
\
7976
&& find /usr/local -depth \
8077
\( \

Dockerfile-debian.template

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ RUN set -ex \
5454
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
5555
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
5656
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
57-
# then we use "pip list" to ensure we don't have more than one pip version installed
58-
# https://github.com/docker-library/python/pull/100
59-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6057
\
6158
&& find /usr/local -depth \
6259
\( \

Dockerfile-slim.template

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ RUN set -ex \
6969
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
7070
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
7171
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
72-
# then we use "pip list" to ensure we don't have more than one pip version installed
73-
# https://github.com/docker-library/python/pull/100
74-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7572
\
7673
&& find /usr/local -depth \
7774
\( \

0 commit comments

Comments
 (0)