浏览代码

Upgrade Python packages using pip.

Josh Haberman 9 年之前
父节点
当前提交
78f9b68600
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      tools/docker/Dockerfile

+ 7 - 1
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++