From be3407f49ed8899ecb9a0aeee3fa67e5eb4669fd Mon Sep 17 00:00:00 2001 From: Bernd Doser Date: Fri, 4 May 2018 12:27:39 +0200 Subject: [PATCH] Use workaround for upgrading pip See https://github.com/pypa/pip/issues/5221 --- Dockerfile | 4 +++- conan-1.3/Dockerfile | 4 +++- eclipse-arduino-4.7.3/Dockerfile | 4 +++- eclipse-cpp-4.7.3/Dockerfile | 4 +++- eclipse-java-4.7.3/Dockerfile | 4 +++- nsight/Dockerfile | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46fa56f..7f2c529 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,6 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -I pyyaml==3.12 +RUN pip install --upgrade pip \ + && hash -r pip \ + && pip install -I pyyaml==3.12 diff --git a/conan-1.3/Dockerfile b/conan-1.3/Dockerfile index 3824e32..b983a53 100644 --- a/conan-1.3/Dockerfile +++ b/conan-1.3/Dockerfile @@ -10,7 +10,9 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip install -I conan==1.3 +RUN pip install --upgrade pip \ + && hash -r pip \ + && pip install -I conan==1.3 # Add conan repositories for root ADD conan_add_repositories.sh /config/ diff --git a/eclipse-arduino-4.7.3/Dockerfile b/eclipse-arduino-4.7.3/Dockerfile index 36120e6..0e513a1 100644 --- a/eclipse-arduino-4.7.3/Dockerfile +++ b/eclipse-arduino-4.7.3/Dockerfile @@ -15,7 +15,9 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -I pyyaml==3.12 +RUN pip3 install --upgrade pip \ + && hash -r pip3 \ + && pip3 install -I pyyaml==3.12 ENV DOWNLOAD_URL http://download.eclipse.org/technology/epp/downloads/release/oxygen/3/eclipse-cpp-oxygen-3-linux-gtk-x86_64.tar.gz ENV INSTALLATION_DIR /usr/local diff --git a/eclipse-cpp-4.7.3/Dockerfile b/eclipse-cpp-4.7.3/Dockerfile index 36120e6..0e513a1 100644 --- a/eclipse-cpp-4.7.3/Dockerfile +++ b/eclipse-cpp-4.7.3/Dockerfile @@ -15,7 +15,9 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -I pyyaml==3.12 +RUN pip3 install --upgrade pip \ + && hash -r pip3 \ + && pip3 install -I pyyaml==3.12 ENV DOWNLOAD_URL http://download.eclipse.org/technology/epp/downloads/release/oxygen/3/eclipse-cpp-oxygen-3-linux-gtk-x86_64.tar.gz ENV INSTALLATION_DIR /usr/local diff --git a/eclipse-java-4.7.3/Dockerfile b/eclipse-java-4.7.3/Dockerfile index 4f1717f..fc5dbff 100644 --- a/eclipse-java-4.7.3/Dockerfile +++ b/eclipse-java-4.7.3/Dockerfile @@ -15,7 +15,9 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -I pyyaml==3.12 +RUN pip3 install --upgrade pip \ + && hash -r pip3 \ + && pip3 install -I pyyaml==3.12 ENV DOWNLOAD_URL http://download.eclipse.org/technology/epp/downloads/release/oxygen/3/eclipse-java-oxygen-3-linux-gtk-x86_64.tar.gz ENV INSTALLATION_DIR /usr/local diff --git a/nsight/Dockerfile b/nsight/Dockerfile index 9adaf63..d9e9187 100644 --- a/nsight/Dockerfile +++ b/nsight/Dockerfile @@ -15,7 +15,9 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -I pyyaml==3.12 +RUN pip3 install --upgrade pip \ + && hash -r pip3 \ + && pip3 install -I pyyaml==3.12 # Install plugins ADD install_plugins.py plugins.yml /config/