Merge pull request #650 from opdemand/fix-controller-make-test

Run django unit tests via 'make test'.

Author: Matthew Fisher

controller/Dockerfile

@@ -2,17 +2,16 @@ FROM deis/base:latest
 MAINTAINER Gabriel A. Monroy <gabriel@opdemand.com>
 
 # install required system packages
-RUN apt-get update
-RUN apt-get install -yq python-dev libpq-dev
-# install latest pip
-RUN wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+RUN apt-get update && \
+    apt-get install -yq python-dev libpq-dev libyaml-dev
 
 # install chef
 RUN apt-get install -yq ruby1.9.1 rubygems
 RUN gem install --no-ri --no-rdoc chef
 
+# install latest pip
+RUN wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install requirements before ADD to cache layer and speed build
 RUN pip install boto==2.23.0 celery==3.1.8 Django==1.6.2 django-allauth==0.15.0 django-guardian==1.1.1 django-json-field==0.5.5 django-yamlfield==0.5 djangorestframework==2.3.12 dop==0.1.4 gevent==1.0 gunicorn==18.0 paramiko==1.12.1 psycopg2==2.5.2 pycrypto==2.6.1 python-etcd==0.3.0 pyrax==1.6.2 PyYAML==3.10 redis==2.8.0 static==1.0.2 South==0.8.4
 
@@ -37,5 +36,6 @@ RUN mkdir -p /templates && chown -R deis:deis /templates
 RUN mkdir -p /var/log/deis && chown -R deis:deis /var/log/deis
 
 # define the execution environment
+WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 8000

controller/Makefile

@@ -1,27 +1,28 @@
-runserver:
-	python manage.py runserver
-
-db:
-	python manage.py syncdb --migrate --noinput
-
-test:
-	python manage.py test --noinput api cm provider web
-
-coverage:
-	coverage run manage.py test --noinput api cm provider web
-	coverage html
-
 build:
 	docker build -t deis/controller .
 
 run:
-	docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-controller deis/controller ; exit 0
+	docker run -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-controller deis/controller
+	exit 0
 
 shell:
-	docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/controller /bin/bash
+	docker run -t -i -e ETCD=$${ETCD:-127.0.0.1:4001} deis/controller /bin/bash
 
 clean:
 	-docker rmi deis/controller
 
+test:
+	python manage.py test --noinput api cm provider web
+
+runserver:
+	python manage.py runserver
+
+db:
+	python manage.py syncdb --migrate --noinput
+
+coverage:
+	coverage run manage.py test --noinput api cm provider web
+	coverage html
+
 flake8:
 	flake8