Merge pull request #9 from andrewsg/base_requirements

Pin requirements and enable concurrency w/ gevent

Author: andrewsg

multicore_runtime/base_requirements.txt

@@ -1,15 +1,19 @@
 # Multicore web application server.
-gunicorn
+gunicorn==19.1.1
 
 # Better HTTP api calls, used by vmstub.py.
-requests
+requests==2.5.0
 
 # Required by the base runtime.
-webapp2
-webob
+webapp2==2.5.2
+WebOb==1.4
 
 # Required to parse app.yaml.
-pyyaml
+PyYAML==3.11
 
 # Better request/response processing for the meta app.
-werkzeug
+Werkzeug==0.10
+
+# Non-blocking I/O libs are not included here because they are installed by
+# `apt-get install python-greenlet python-eventlet`
+# to avoid having to install compilers and dev libraries in every container.

multicore_runtime/dev/Dockerfile

@@ -5,11 +5,10 @@ FROM google/debian:wheezy
 # http://docs.docker.io/en/latest/reference/builder/#entrypoint.
 CMD []
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get -q update ; \
-  apt-get install --no-install-recommends -y -q ca-certificates net-tools lsof && \
-  apt-get -y -q upgrade
-
-RUN apt-get -q update ; apt-get -y -q --no-install-recommends install python2.7 python-pip
+RUN apt-get -q update && \
+  apt-get install --no-install-recommends -y -q ca-certificates net-tools lsof \
+    python2.7 python-pip python-gevent python-greenlet && \
+  apt-get -y -q upgrade && apt-get clean && rm /var/lib/apt/lists/*_*
 
 ADD python_vm_runtime.tar.gz /home/vmagent/python_vm_runtime
 
@@ -20,9 +19,8 @@ WORKDIR /app
 
 RUN ln -s /home/vmagent/python_vm_runtime/google /home/vmagent/app/google
 
-ENTRYPOINT ["/usr/bin/env", "gunicorn", "-b", "0.0.0.0:8080", "wsgi:meta_app", "--log-file=-"]
+ENTRYPOINT ["/usr/bin/env", "gunicorn", "-w", "4", "-k", "gevent", "-b", "0.0.0.0:8080", "wsgi:meta_app", "--log-file=-"]
 
 ADD . /home/vmagent/app/
 
 RUN pip install -r base_requirements.txt
-