diff --git a/Dockerfile b/Dockerfile index 2c0c553..339bbdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,10 @@ RUN apt-get update RUN apt-get -y upgrade RUN apt-get -y install nginx supervisor #RUN apt-get -y install mysql-server-5.6 -RUN apt-get -y install git python-pip python-dev build-essential g++ libbz2-dev libncurses5-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt-dev make zlib1g-dev +RUN apt-get -y install git python-pip python-dev build-essential g++ libbz2-dev libncurses5-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt-dev make zlib1g-dev libmysqlclient-dev libldap2-dev libsasl2-dev RUN git clone https://github.com/ustream/openduty.git /opt/openduty RUN cd /opt/openduty && pip install -r requirements.txt RUN cd /opt/openduty && pip install gunicorn -RUN cd /opt/openduty && export DJANGO_SETTINGS_MODULE=openduty.settings_dev && python manage.py syncdb -RUN cd /opt/openduty && export DJANGO_SETTINGS_MODULE=openduty.settings_dev && python manage.py migrate ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf ADD nginx.conf /etc/nginx/nginx.conf diff --git a/supervisord.conf b/supervisord.conf index 02a9b68..b4f31c4 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -2,10 +2,13 @@ nodaemon=true [program:openduty] -command=bash -c "cd /opt/openduty && export DJANGO_SETTINGS_MODULE=openduty.settings_dev && exec python manage.py runserver 0.0.0.0:8000" +command=bash -c "cd /opt/openduty && export DJANGO_SETTINGS_MODULE=openduty.settings && exec python manage.py runserver 0.0.0.0:8000" [program:nginx] command=/usr/sbin/nginx +[program:celeryd] +command=bash -c "cd /opt/openduty && DJANGO_SETTINGS_MODULE=openduty.settings C_FORCE_ROOT=true python manage.py celery worker" + #[program:mysqld] #command=/usr/bin/mysqld_safe