commit 78f9b68600c32492100ad61eb6b53ffa1f74263b
author Josh Haberman <jhaberman@gmail.com> Mon Feb 22 14:26:21 2016 -0800
committer Josh Haberman <jhaberman@gmail.com> Wed Mar 02 14:51:09 2016 -0800
tree db34e077163a46ea2a9c462ff99d454ea0de26b6
parent f6153b540a71475b1af8cc6818a28d1145763e83

Upgrade Python packages using pip.

tools/docker/Dockerfile

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index b5b712f..2a45132 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -60,13 +60,19 @@
   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++