commit 6d23fcb9eac157926efb239c021c364ddd2a2932
author Andy Bavier <acb@cs.princeton.edu> Fri Apr 24 10:52:27 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Fri Apr 24 10:52:27 2015 -0400
tree a866c903c80109f7ca9fa0ae69217aa2aa530fdd
parent 666e6e01c7f14306802f09d2b4be1816e621ec94

Tweaks

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index a99b77d..b722a3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,6 +84,10 @@
 RUN ln -s /usr/local/share/phantomjs-1.7.0-linux-x86_64 /usr/local/share/phantomjs
 RUN ln -s /usr/local/share/phantomjs/bin/phantomjs /bin/phantomjs
 
+# Supervisor
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor
+ADD observer.conf /etc/supervisor/conf.d/
+
 # Get XOS 
 ADD xos /opt/xos
 
@@ -106,6 +110,9 @@
 # Cruft to workaround problems with migrations, should go away...
 RUN /opt/xos/scripts/opencloud remigrate
 
+# git clone uses cached copy, doesn't pick up latest
+RUN git -C /opt/ansible pull
+
 EXPOSE 8000
 
 # Set environment variables.
@@ -116,4 +123,4 @@
 
 # Define default command.
 #CMD ["/bin/bash"]
-CMD service postgresql start; cd /opt/xos; PUBLIC_HOSTNAME=`./xos-config.py get server_hostname $HOSTNAME`; python manage.py runserver $PUBLIC_HOSTNAME:8000
+CMD service postgresql start; service supervisor start; cd /opt/xos; PUBLIC_HOSTNAME=`./xos-config.py get server_hostname $HOSTNAME`; python manage.py runserver $PUBLIC_HOSTNAME:8000