refs #931. Clean shutdown.

Dockerfile

@@ -39,8 +39,6 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log
 ENV DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings
 ENV LOAD_FIXTURES=false
 EXPOSE 80
+STOPSIGNAL SIGWINCH
 
-CMD sh /opt/sfm-setup/setup_reqs.sh \
-    && appdeps.py --wait-secs 60 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672  --file-wait /sfm-data/collection_set \
-    && sh /opt/sfm-setup/setup_ui.sh \
-    && sh /opt/sfm-setup/invoke.sh
+CMD ["/opt/sfm-setup/invoke.sh"]

Dockerfile-consumer

@@ -7,10 +7,10 @@ RUN pip install -r requirements/common.txt -r requirements/release.txt
 
 RUN pip install django-finalware==0.1.0
 
+ADD docker/consumer/invoke_consumer.sh /opt/sfm-setup/
+RUN chmod +x /opt/sfm-setup/invoke_consumer.sh
+
 ENV DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings
 ENV LOAD_FIXTURES=false
 
-# Waiting for ui to start so that syncdb performed.
-CMD sh /opt/sfm-setup/setup_reqs.sh \
-    && appdeps.py --wait-secs 90 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672 --port-wait ui:8080 --file-wait /sfm-data/collection_set \
-    && gosu sfm /opt/sfm-ui/sfm/manage.py startconsumer
+CMD ["/opt/sfm-setup/invoke_consumer.sh"]

Dockerfile-runserver

@@ -21,7 +21,4 @@ ENV DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings
 ENV LOAD_FIXTURES=false
 EXPOSE 8000
 
-CMD sh /opt/sfm-setup/setup_reqs.sh \
-    && appdeps.py --wait-secs 60 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672 --file-wait /sfm-data/collection_set \
-    && sh /opt/sfm-setup/setup_ui.sh \
-    && sh /opt/sfm-setup/invoke_runserver.sh
+CMD ["/opt/sfm-setup/invoke_runserver.sh"]

docker/consumer/invoke_consumer.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+sh /opt/sfm-setup/setup_reqs.sh
+appdeps.py --wait-secs 90 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672 --port-wait ui:8080 --file-wait /sfm-data/collection_set
+
+echo "Running consumer"
+exec gosu sfm /opt/sfm-ui/sfm/manage.py startconsumer

docker/ui/invoke.sh

@@ -1,9 +1,15 @@
 #!/bin/bash
+set -e
+
+sh /opt/sfm-setup/setup_reqs.sh
+appdeps.py --wait-secs 60 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672  --file-wait /sfm-data/collection_set
+sh /opt/sfm-setup/setup_ui.sh
 
 echo "Running server"
 export SFM_RUN_SCHEDULER=True
-# source /etc/apache2/envvars
+source /etc/apache2/envvars
 # old, incompletely-shutdown httpd makes the apache start incorrectly
 rm -rf /run/apache2/* /tmp/httpd*
-echo "start apache on foreground"
-apachectl -DFOREGROUND
+
+echo "start apache"
+exec apache2 -DFOREGROUND

docker/ui/invoke_runserver.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
+set -e
+
+sh /opt/sfm-setup/setup_reqs.sh
+appdeps.py --wait-secs 60 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672 --file-wait /sfm-data/collection_set
+sh /opt/sfm-setup/setup_ui.sh
 
 echo "Running server"
 export SFM_RUN_SCHEDULER=True
-gosu sfm /opt/sfm-ui/sfm/manage.py runserver 0.0.0.0:8080
+exec gosu sfm /opt/sfm-ui/sfm/manage.py runserver 0.0.0.0:8080

docs/install.rst

@@ -206,7 +206,7 @@ Note:
 To stop the containers gracefully::
 
     docker-compose stop -t 180 twitterstreamharvester
-    docker-compose stop
+    docker-compose stop -t 45
 
 SFM can then be restarted with ``docker-compose up -d``.