aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2016-02-22 14:26:21 -0800
committerGravatar Josh Haberman <jhaberman@gmail.com>2016-03-02 14:51:09 -0800
commit78f9b68600c32492100ad61eb6b53ffa1f74263b (patch)
treedb34e077163a46ea2a9c462ff99d454ea0de26b6
parentf6153b540a71475b1af8cc6818a28d1145763e83 (diff)
Upgrade Python packages using pip.
-rw-r--r--tools/docker/Dockerfile8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index b5b712fa..2a451321 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -60,13 +60,19 @@ RUN apt-get update && apt-get install -y \
openjdk-7-jdk \
# -- For python / python_cpp -- \
python-setuptools \
- python-tox \
+ python-pip \
python-dev \
python2.6-dev \
python3.3-dev \
python3.4-dev \
&& apt-get clean
+# These packages exist in apt-get, but their versions are too old, so we have
+# to get updates from pip.
+
+RUN pip install pip --upgrade
+RUN pip install virtualenv tox
+
# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
RUN ln -s /usr/bin/ccache /usr/local/bin/g++