vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Performance improvements meant to help get jobs off of the load balancer more quickly.

Browse source
This commit is contained in:
Jake Moshenko 2014-12-18 11:53:10 -05:00
parent e5f41889cf
commit 2b0fc9087f
7 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Dockerfile.buildworker
View file

@ -1,23 +1,30 @@
# vim:ft=dockerfile # vim:ft=dockerfile
###############################
# BEGIN COMMON SECION
###############################
FROM phusion/baseimage:0.9.15 FROM phusion/baseimage:0.9.15
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV HOME /root ENV HOME /root
# Install the dependencies. # Install the dependencies.
RUN apt-get update # 20NOV2014 RUN apt-get update # 11DEC2014
# New ubuntu packages should be added as their own apt-get install lines below the existing install commands # New ubuntu packages should be added as their own apt-get install lines below the existing install commands
RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev libffi-dev
# Build the python dependencies # Build the python dependencies
ADD requirements.txt requirements.txt ADD requirements.txt requirements.txt
RUN virtualenv --distribute venv RUN virtualenv --distribute venv
RUN venv/bin/pip install -r requirements.txt RUN venv/bin/pip install -r requirements.txt
RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev libffi-dev
### End common section ### ###############################
# END COMMON SECION
###############################
RUN apt-get install -y lxc aufs-tools RUN apt-get install -y lxc aufs-tools

13
Dockerfile.web
View file

@ -1,4 +1,9 @@
# vim:ft=dockerfile # vim:ft=dockerfile
###############################
# BEGIN COMMON SECION
###############################
FROM phusion/baseimage:0.9.15 FROM phusion/baseimage:0.9.15
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
@ -8,16 +13,18 @@ ENV HOME /root
RUN apt-get update # 11DEC2014 RUN apt-get update # 11DEC2014
# New ubuntu packages should be added as their own apt-get install lines below the existing install commands # New ubuntu packages should be added as their own apt-get install lines below the existing install commands
RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev libffi-dev
# Build the python dependencies # Build the python dependencies
ADD requirements.txt requirements.txt ADD requirements.txt requirements.txt
RUN virtualenv --distribute venv RUN virtualenv --distribute venv
RUN venv/bin/pip install -r requirements.txt RUN venv/bin/pip install -r requirements.txt
RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev libffi-dev
### End common section ### ###############################
# END COMMON SECION
###############################
# Remove SSH. # Remove SSH.
RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh

2
conf/init/gunicorn_registry/run
View file

@ -3,6 +3,6 @@
echo 'Starting gunicon' echo 'Starting gunicon'
cd / cd /
venv/bin/gunicorn -c conf/gunicorn_registry.py registry:application nice -n 10 venv/bin/gunicorn -c conf/gunicorn_registry.py registry:application
echo 'Gunicorn exited' echo 'Gunicorn exited'

2
conf/init/gunicorn_verbs/run
View file

@ -3,6 +3,6 @@
echo 'Starting gunicon' echo 'Starting gunicon'
cd / cd /
nice -10 venv/bin/gunicorn -c conf/gunicorn_verbs.py verbs:application nice -n 10 venv/bin/gunicorn -c conf/gunicorn_verbs.py verbs:application
echo 'Gunicorn exited' echo 'Gunicorn exited'

6
conf/nginx-nossl.conf
View file

@ -1,11 +1,5 @@
include root-base.conf; include root-base.conf;
worker_processes 2;
user root nogroup;
daemon off;
http { http {
include http-base.conf; include http-base.conf;

6
conf/nginx.conf
View file

@ -1,11 +1,5 @@
include root-base.conf; include root-base.conf;
worker_processes 2;
user root nogroup;
daemon off;
http { http {
include http-base.conf; include http-base.conf;

10
conf/root-base.conf
View file

@ -1,7 +1,15 @@
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
error_log /var/log/nginx/nginx.error.log; error_log /var/log/nginx/nginx.error.log;
worker_processes 2;
worker_priority -10;
worker_rlimit_nofile = 10240;
user root nogroup;
daemon off;
events { events {
worker_connections 1024; worker_connections 10240;
accept_mutex off; accept_mutex off;
} }