From dcd45559b4c58e95e4d4d726d86550a9f84b7e1e Mon Sep 17 00:00:00 2001 From: Mal Graty Date: Fri, 31 Mar 2017 23:44:47 +0100 Subject: [PATCH 1/3] 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. --- Dockerfile-alpine.template | 3 --- Dockerfile-debian.template | 3 --- Dockerfile-slim.template | 3 --- 3 files changed, 9 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 79e1cd2e5..6b9c054e9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -72,9 +72,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 56c6ef26d..8c8c33bd5 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -54,9 +54,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 6c64ab5a6..3bbaa7cee 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -69,9 +69,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ From 63461ec543602ceb4821b7544699fd2a6a7214a8 Mon Sep 17 00:00:00 2001 From: Mal Graty Date: Fri, 31 Mar 2017 23:45:49 +0100 Subject: [PATCH 2/3] Run update --- 3.3/Dockerfile | 3 --- 3.3/alpine/Dockerfile | 3 --- 3.3/slim/Dockerfile | 3 --- 3.3/wheezy/Dockerfile | 3 --- 3.4/Dockerfile | 3 --- 3.4/alpine/Dockerfile | 3 --- 3.4/slim/Dockerfile | 3 --- 3.4/wheezy/Dockerfile | 3 --- 3.5/Dockerfile | 3 --- 3.5/alpine/Dockerfile | 3 --- 3.5/slim/Dockerfile | 3 --- 3.6/Dockerfile | 3 --- 3.6/alpine/Dockerfile | 3 --- 3.6/slim/Dockerfile | 3 --- 14 files changed, 42 deletions(-) diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 0c171389f..55a6506a7 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -60,9 +60,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile index 042ae7ce4..6b6c9776d 100644 --- a/3.3/alpine/Dockerfile +++ b/3.3/alpine/Dockerfile @@ -78,9 +78,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile index 648b8abbe..3c72d9a51 100644 --- a/3.3/slim/Dockerfile +++ b/3.3/slim/Dockerfile @@ -75,9 +75,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile index 580513e7d..4fdada3c2 100644 --- a/3.3/wheezy/Dockerfile +++ b/3.3/wheezy/Dockerfile @@ -60,9 +60,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 93bc245b4..d6888f19b 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -60,9 +60,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index 684a95488..a0438dc6d 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -78,9 +78,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile index f4ce201e5..df4632c31 100644 --- a/3.4/slim/Dockerfile +++ b/3.4/slim/Dockerfile @@ -75,9 +75,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index f6c1ce755..ad2f99620 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -60,9 +60,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 85bf3bbf6..c609a9749 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -60,9 +60,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile index a867fb86b..a222912b0 100644 --- a/3.5/alpine/Dockerfile +++ b/3.5/alpine/Dockerfile @@ -78,9 +78,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile index 422f81a11..0cc038e33 100644 --- a/3.5/slim/Dockerfile +++ b/3.5/slim/Dockerfile @@ -75,9 +75,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.6/Dockerfile b/3.6/Dockerfile index 6d9a1c467..3dd6eef4f 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -60,9 +60,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile index b16146e7d..e099c50bf 100644 --- a/3.6/alpine/Dockerfile +++ b/3.6/alpine/Dockerfile @@ -78,9 +78,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile index 7ebb1e883..bb1ed167e 100644 --- a/3.6/slim/Dockerfile +++ b/3.6/slim/Dockerfile @@ -75,9 +75,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ From cdad062493e2a0841e1c537d6220e69494ce1632 Mon Sep 17 00:00:00 2001 From: Mal Graty Date: Fri, 31 Mar 2017 23:48:57 +0100 Subject: [PATCH 3/3] Update 2.7 --- 2.7/Dockerfile | 3 --- 2.7/alpine/Dockerfile | 3 --- 2.7/slim/Dockerfile | 3 --- 2.7/wheezy/Dockerfile | 3 --- 4 files changed, 12 deletions(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 3c124783e..d14992ff6 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -51,9 +51,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index fe299aa02..1fe9b78f2 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -68,9 +68,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile index fa8a55d60..5b43628b8 100644 --- a/2.7/slim/Dockerfile +++ b/2.7/slim/Dockerfile @@ -66,9 +66,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \ diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index b14b748a0..f6cbda7a1 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -51,9 +51,6 @@ RUN set -ex \ # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ -# then we use "pip list" to ensure we don't have more than one pip version installed -# https://github.com/docker-library/python/pull/100 - && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ \ && find /usr/local -depth \ \( \