Skip to content

Commit 089f8ce

Browse files
tianontianon
authored
Merge pull request docker-library#187 from mal/deprecation
Fix pip list deprecation warning
2 parents 32e920e + cdad062 commit 089f8ce

21 files changed

Lines changed: 0 additions & 63 deletions

‎2.7/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ 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
55-
# https://github.com/docker-library/python/pull/100
56-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5754
\
5855
&& find /usr/local -depth \
5956
\( \

‎2.7/alpine/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ 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
72-
# https://github.com/docker-library/python/pull/100
73-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7471
\
7572
&& find /usr/local -depth \
7673
\( \

‎2.7/slim/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ 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
70-
# https://github.com/docker-library/python/pull/100
71-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
7269
\
7370
&& find /usr/local -depth \
7471
\( \

‎2.7/wheezy/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ 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
55-
# https://github.com/docker-library/python/pull/100
56-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
5754
\
5855
&& find /usr/local -depth \
5956
\( \

‎3.3/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ RUN set -ex \
6060
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6161
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
6262
&& 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
65-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6663
\
6764
&& find /usr/local -depth \
6865
\( \

‎3.3/alpine/Dockerfile‎

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

‎3.3/slim/Dockerfile‎

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

‎3.3/wheezy/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ RUN set -ex \
6060
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6161
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
6262
&& 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
65-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6663
\
6764
&& find /usr/local -depth \
6865
\( \

‎3.4/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ RUN set -ex \
6060
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6161
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
6262
&& 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
65-
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \
6663
\
6764
&& find /usr/local -depth \
6865
\( \

‎3.4/alpine/Dockerfile‎

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

0 commit comments

Comments
 (0)