optimizations to run.sh and Dockerfile

Author: mbentley

Dockerfile

@@ -1,18 +1,16 @@
 FROM debian:jessie
 MAINTAINER Matt Bentley <[email protected]>
-RUN (echo "deb http://http.debian.net/debian/ jessie main contrib non-free" > /etc/apt/sources.list && echo "deb http://http.debian.net/debian/ jessie-updates main contrib non-free" >> /etc/apt/sources.list && echo "deb http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list)
-RUN apt-get update
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git python python-dev python-setuptools nginx sqlite3 supervisor
-RUN easy_install pip
-RUN pip install uwsgi
+RUN (apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git python python-dev python-setuptools nginx sqlite3 supervisor)
+RUN (easy_install pip &&\
+  pip install uwsgi)
 
 ADD . /opt/django/
 
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-RUN rm /etc/nginx/sites-enabled/default
-RUN ln -s /opt/django/django.conf /etc/nginx/sites-enabled/
-RUN ln -s /opt/django/supervisord.conf /etc/supervisor/conf.d/
+RUN (echo "daemon off;" >> /etc/nginx/nginx.conf &&\
+  rm /etc/nginx/sites-enabled/default &&\
+  ln -s /opt/django/django.conf /etc/nginx/sites-enabled/ &&\
+  ln -s /opt/django/supervisord.conf /etc/supervisor/conf.d/)
 
 RUN pip install -r /opt/django/app/requirements.txt
 

README.md

@@ -2,7 +2,7 @@ mbentley/django-uwsgi-nginx
 ==================
 
 docker image for django (uwsgi) & nginx
-based off of stackbrew/debian:jessie
+based off of debian:jessie
 
 To pull this image:
 `docker pull mbentley/django-uwsgi-nginx`

run.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
 
+set -e
+
 MODULE=${MODULE:-website}
 
 sed -i "s#module=website.wsgi:application#module=${MODULE}.wsgi:application#g" /opt/django/uwsgi.ini
 
 if [ ! -f "/opt/django/app/manage.py" ]
 then
-	echo "creating basic django project (module: ${MODULE})"
-	django-admin.py startproject ${MODULE} /opt/django/app/
+  echo "creating basic django project (module: ${MODULE})"
+  django-admin.py startproject ${MODULE} /opt/django/app/
 fi
 
-/usr/bin/supervisord
+exec /usr/bin/supervisord