Skip to content

update to work with current code, run celery also #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to work with current code, run celery also #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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