Skip to content

Commit a689556

Browse files
committed
Update 2.7
1 parent afbd6db commit a689556

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

2.7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN set -ex \
5151
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
5252
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
5353
&& 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
54+
# then we use "pip freeze" to ensure we don't have more than one pip version installed
5555
# https://github.com/docker-library/python/pull/100
56-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
56+
&& [ "$(pip freeze --all |tac|tac| awk -F '==' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5757
\
5858
&& find /usr/local -depth \
5959
\( \

2.7/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ RUN set -ex \
6868
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6969
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
7070
&& 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
71+
# then we use "pip freeze" to ensure we don't have more than one pip version installed
7272
# https://github.com/docker-library/python/pull/100
73-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
73+
&& [ "$(pip freeze --all |tac|tac| awk -F '==' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7474
\
7575
&& find /usr/local -depth \
7676
\( \

2.7/slim/Dockerfile

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

2.7/wheezy/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN set -ex \
5151
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
5252
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
5353
&& 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
54+
# then we use "pip freeze" to ensure we don't have more than one pip version installed
5555
# https://github.com/docker-library/python/pull/100
56-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
56+
&& [ "$(pip freeze --all |tac|tac| awk -F '==' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5757
\
5858
&& find /usr/local -depth \
5959
\( \

0 commit comments

Comments
 (0)