add bower and npm packages, add debian requirements

diff --git a/Dockerfile b/Dockerfile
index ab3dd4aa4f7dc1cb60ea0833ad261dc320beb354..05905e60d02ce495a3a7973434a3f8a1ffe82628 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,21 +2,26 @@ FROM python:3
 
 ENV PYTHONUNBUFFERED 1
 
+RUN mkdir /srv/app
+RUN mkdir /srv/lib
+WORKDIR /srv/app
+
+COPY debian-requirements.txt /srv/app/
 RUN apt-get update && \
-    apt-get -y --force-yes install locales netcat pandoc && \
+    DEBIAN_PACKAGES=$(egrep -v "^\s*(#|$)" debian-requirements.txt) && \
+    apt-get install -y --force-yes $DEBIAN_PACKAGES && \
     echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen && \
-    locale-gen
+    locale-gen \
+    apt-get clean
 
 ENV LANG fr_FR.UTF-8
 ENV LANGUAGE fr_FR:fr
 ENV LC_ALL fr_FR.UTF-8
 
-RUN mkdir /srv/app
-RUN mkdir /srv/lib
-WORKDIR /srv/app
-
 ADD requirements.txt /srv/app/
 RUN pip install -r requirements.txt
 
 ADD requirements-dev.txt /srv/app/
 RUN pip install -r requirements-dev.txt --src /srv/lib
+
+RUN npm install -g bower

diff --git a/app/local_settings.py b/app/local_settings.py
index c6bf5b5ff5167d42e5b815a3d8b635676e11d98c..d764a1e84d8fd020275c59ab4b67bd94f994654d 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -38,7 +38,7 @@ DATABASES = {
 
 }
 
-DATABASE_ROUTERS = ['eve.routers.EveRouter',]
+# DATABASE_ROUTERS = ['eve.routers.EveRouter',]
 
 
 # EXTENSIONS AND FORMATS

diff --git a/app/settings.py b/app/settings.py
index 64e2e3304f346184a50b22696597b9a17da3bfe9..07a1896ba0965f6262a60b8a89086952cc2ea64a 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -220,6 +220,7 @@ INSTALLED_APPS = [
     "mezzanine.accounts",
     # "mezzanine.mobile",
     # "eve",
+    'djangobower',
     "meta",
     "mezzanine_agenda",
     "festival",
@@ -296,6 +297,14 @@ MIDDLEWARE_CLASSES = (
 PACKAGE_NAME_FILEBROWSER = "filebrowser_safe"
 PACKAGE_NAME_GRAPPELLI = "grappelli_safe"
 
+
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    'djangobower.finders.BowerFinder',
+)
+
 #########################
 # OPTIONAL APPLICATIONS #
 #########################

diff --git a/debian-requirements.txt b/debian-requirements.txt
new file mode 100644 (file)
index 0000000..4c46280
--- /dev/null
+++ b/debian-requirements.txt
@@ -0,0 +1,9 @@
+git
+wget
+bzip2
+build-essential
+netcat
+npm
+locales
+pandoc
+nodejs-legacy

diff --git a/etc/sources.list b/etc/sources.list
new file mode 100644 (file)
index 0000000..0237e67
--- /dev/null
+++ b/etc/sources.list
@@ -0,0 +1,8 @@
+deb http://mirrors.ircam.fr/pub/debian/ jessie main contrib non-free
+deb-src http://mirrors.ircam.fr/pub/debian/ testing main contrib non-free
+
+deb http://security.debian.org/ jessie/updates main
+deb-src http://security.debian.org/ jessie/updates main
+
+deb http://mirrors.ircam.fr/pub/debian/ jessie-updates main
+deb-src http://mirrors.ircam.fr/pub/debian/ jessie-updates main

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 015ae5e812e98d590522960ba695da8fe7e9c9ce..327f10f473a6fce6e7ef4f40d8866baa7d611a43 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
 -e git+https://github.com/stephenmcd/mezzanine.git#egg=mezzanine-4.1-dev
-https://forge.ircam.fr/p/django-eve/source/download/dev/
+#https://forge.ircam.fr/p/django-eve/source/download/dev/
 #
 #