From 9f19d14dd99b6f2c2d95883aa9141d592b4ab869 Mon Sep 17 00:00:00 2001 From: Kane Date: Sat, 9 Apr 2016 16:28:06 +1000 Subject: [PATCH] Prevent two versions of pip --- 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 040aea56b..2e4cb3037 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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index e7eb0a571..a1db3e6fe 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -42,7 +42,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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile index 9b700461b..f85b71e10 100644 --- a/3.4/slim/Dockerfile +++ b/3.4/slim/Dockerfile @@ -51,7 +51,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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index e92fef69e..cf91a069c 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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 5879a9764..69d436619 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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile index 2f50b9628..cdac5d6f2 100644 --- a/3.5/alpine/Dockerfile +++ b/3.5/alpine/Dockerfile @@ -42,7 +42,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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile index 671265a52..d50358aa0 100644 --- a/3.5/slim/Dockerfile +++ b/3.5/slim/Dockerfile @@ -51,7 +51,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 \ \( -type d -a -name test -o -name tests \) \ -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \