update docker apps, add apt gpg keys

diff --git a/Dockerfile b/Dockerfile
index 35ecbf9dd620534245426bc91796d7a307a7e276..a831254065a6fc99a8c19c7a27d37b03a3f28a7d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,11 +18,15 @@ from debian:stable
 maintainer Guillaume Pellerin <yomguy@parisson.com>
 
 add ./deploy/apt-app.list /etc/apt/sources.list.d/
+run gpg --keyserver pgpkeys.mit.edu --recv-key E3298399DF14BB7C
+run gpg -a --export E3298399DF14BB7C | sudo apt-key add -
+run gpg --keyserver pgpkeys.mit.edu --recv-key 07DC563D1F41B907
+run gpg -a --export 07DC563D1F41B907 | sudo apt-key add -
 run apt-get update
-run apt-get install -y --force-yes build-essential vim
+run apt-get install -y --force-yes build-essential vim apt-utils
 run apt-get install -y python python-dev python-pip
 run apt-get -y -t wheezy-backports dist-upgrade
-run apt-get install -y --force-yes -t wheezy-backports nginx supervisor python-timeside git python-tables python-django python-traits python-networkx ipython python-numexpr gstreamer0.10-alsa
+run apt-get install -y --force-yes -t wheezy-backports nginx supervisor python-timeside git python-tables python-traits python-networkx ipython python-numexpr gstreamer0.10-alsa
 run apt-get clean
 
 # install uwsgi now because it takes a little while

diff --git a/setup.py b/setup.py
index 7e0986c7a3685fbbe4371ca0fce9006ff62118c0..11222d33bdd5b3c9dd54904085732dcff0c53db1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
         'simplejson',
         'scipy',
         'matplotlib',
-        'django>=1.4',
+        'django<1.7',
         'django-extensions',
         'djangorestframework',
         'south',