From e24ae9064f0f2e9cecb4831dc7970c8a01207d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Mon, 27 Jun 2016 11:17:11 +0200 Subject: [PATCH] Do not ignore installed when updating pip Fixes docker-library/python#118 Regards pypa/pip#3538 --- 3.4/Dockerfile | 2 +- 3.4/alpine/Dockerfile | 2 +- 3.4/slim/Dockerfile | 2 +- 3.4/wheezy/Dockerfile | 2 +- 3.5/Dockerfile | 2 +- 3.5/alpine/Dockerfile | 2 +- 3.5/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/3.4/Dockerfile b/3.4/Dockerfile index e9cdd2c62..743473130 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -31,7 +31,7 @@ RUN set -ex \ && make -j$(nproc) \ && make install \ && ldconfig \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \ diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index 5029f4ff1..f3255ba9d 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN set -ex \ && ./configure --enable-shared --enable-unicode=ucs4 \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \ diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile index 962c1273e..f85128c57 100644 --- a/3.4/slim/Dockerfile +++ b/3.4/slim/Dockerfile @@ -52,7 +52,7 @@ RUN set -ex \ && make -j$(nproc) \ && make install \ && ldconfig \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index 68a0bcf09..a7df3d889 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -31,7 +31,7 @@ RUN set -ex \ && make -j$(nproc) \ && make install \ && ldconfig \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \ diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 0a64e48f4..eb8b2dadf 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -31,7 +31,7 @@ RUN set -ex \ && make -j$(nproc) \ && make install \ && ldconfig \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \ diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile index b39199076..7615ea555 100644 --- a/3.5/alpine/Dockerfile +++ b/3.5/alpine/Dockerfile @@ -43,7 +43,7 @@ RUN set -ex \ && ./configure --enable-shared --enable-unicode=ucs4 \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \ diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile index 0c3e35fcd..9ed13694a 100644 --- a/3.5/slim/Dockerfile +++ b/3.5/slim/Dockerfile @@ -52,7 +52,7 @@ RUN set -ex \ && make -j$(nproc) \ && make install \ && ldconfig \ - && pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \ + && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && find /usr/local -depth \ \( \ \( -type d -a -name test -o -name tests \) \