From b87e1486896f7bf36d7d3e818cdcef0e24272c07 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 5 Nov 2014 13:25:42 +0100 Subject: [PATCH] update docker apps, add apt gpg keys --- Dockerfile | 8 ++++++-- setup.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 35ecbf9..a831254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,11 +18,15 @@ from debian:stable maintainer Guillaume Pellerin 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 7e0986c..11222d3 100755 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ setup( 'simplejson', 'scipy', 'matplotlib', - 'django>=1.4', + 'django<1.7', 'django-extensions', 'djangorestframework', 'south', -- 2.39.5