Update pip, setuptools, virtualenv when we build the base runtime image. (GoogleCloudPlatform#161)

Douglas Greiman · web-flow · commit 0965d52c5f1b · 2017-10-31T11:06:10.000-07:00
diff --git a/runtime-image/Dockerfile.in b/runtime-image/Dockerfile.in
@@ -16,15 +16,18 @@ ENV LANG C.UTF-8
 # logging collection.
 ENV PYTHONUNBUFFERED 1
 
-# Upgrade pip (debian package version tends to run a few version behind) and
-# install virtualenv system-wide.
-RUN pip install --upgrade pip virtualenv
-
 # Install the Google-built interpreters
 ADD interpreters.tar.gz /
 
 # Add Google-built interpreters to the path
-ENV PATH /opt/python3.5/bin:/opt/python3.6/bin:$PATH
+ENV PATH /opt/python3.6/bin:/opt/python3.5/bin:$PATH
+
+# Upgrade pip (debian package version tends to run a few version behind) and
+# install virtualenv system-wide.
+RUN /usr/bin/pip install --upgrade -r /resources/requirements.txt && \
+    /usr/bin/pip3 install --upgrade -r /resources/requirements.txt && \
+    /opt/python3.5/bin/pip3.5 install --upgrade -r /resources/requirements.txt && \
+    /opt/python3.6/bin/pip3.6 install --upgrade -r /resources/requirements.txt
 
 # Setup the app working directory
 RUN ln -s /home/vmagent/app /app
diff --git a/runtime-image/resources/apt-packages.txt b/runtime-image/resources/apt-packages.txt
@@ -7,6 +7,7 @@ wget
 python-pip
 python2.7
 python2.7-dev
+python3-pip
 python3.4
 python3.4-dev
 # Dependenies for third-party Python packages
diff --git a/runtime-image/resources/requirements.txt b/runtime-image/resources/requirements.txt
@@ -0,0 +1,3 @@
+pip==9.0.1
+setuptools==36.6.0
+virtualenv==15.1.0
