Merge pull request #8855 from funkyfuture/recent_pip

Dockerfile: install recent pip
ipython · Oct 1, 2015 · 7d74a40 · 7d74a40
2 parents a5bfd6e + ac551b4
commit 7d74a40
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,15 +20,14 @@ RUN dpkg-reconfigure locales
 # Python binary dependencies, developer tools
 RUN apt-get update && apt-get install -y -q \
     build-essential \
+    curl \
     make \
     gcc \
     zlib1g-dev \
     git \
     python \
     python-dev \
-    python-pip \
     python3-dev \
-    python3-pip \
     python-sphinx \
     python3-sphinx \
     libzmq3-dev \
@@ -40,6 +39,12 @@ RUN apt-get update && apt-get install -y -q \
     nodejs-legacy \
     npm
 
+# Install the recent pip release
+RUN curl -O https://bootstrap.pypa.io/get-pip.py \
+ && python2 get-pip.py \
+ && python3 get-pip.py \
+ && rm get-pip.py
+
 # In order to build from source, need less
 RUN npm install -g 'less@<3.0'