Pin more deps, use Telemeta 1.6 image

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 192e1c5d410f613e1484d2aae2a057ca49371a61..c529d6b3d43e1ccb800c4b5ad17575965948cd1c 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -11,8 +11,8 @@ log='/var/log/uwsgi/app.log'
 
 # uwsgi params
 port=8000
-processes=2
-threads=2
+processes=8
+threads=8
 uid='www-data'
 gid='www-data'
 patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
@@ -20,6 +20,7 @@ patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 # stating apps
 # pip install django-bootstrap3==6.2.1
 pip install south
+pip install django-extensions==1.6.7 django-extra-views==0.8.0
 
 # waiting for other network services
 sh $app/scripts/wait.sh

diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh
index 44864a841595ec9cb5d59eec98ebea6c6ef98f16..c6fca474c90341ed12c94228588af4727d51c345 100644 (file)
--- a/app/scripts/worker.sh
+++ b/app/scripts/worker.sh
@@ -8,6 +8,7 @@ wsgi=$app'/wsgi.py'
 # stating apps
 # pip install django-environ redis
 pip install south
+pip install django-extensions==1.6.7 django-extra-views==0.8.0
 
 # waiting for other services
 bash $app/scripts/wait.sh

diff --git a/app/settings.py b/app/settings.py
index 0b854a920d3abf6b8ed1600ef8b77fe8a13a5c5a..c51139e8ea498159b5935f96d61cad758d35a5be 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -124,7 +124,6 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     # Manage Django URLs for AngularJS with django-angular
-    'djng.middleware.AngularUrlMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -171,7 +170,6 @@ INSTALLED_APPS = (
     'djcelery',
     'haystack',
     'djangobower',
-    'djng',
     'saved_searches',
 )
 
@@ -357,9 +355,6 @@ BOWER_INSTALLED_APPS = (
     'bootstrap#3.3.7',
     'bootstrap-select#1.5.4',
     'font-awesome#4.4.0',
-    'angular#1.2.26',
-    'angular-bootstrap-select#0.0.5',
-    'angular-resource#1.2.26',
     'raphael#2.2.7',
     'soundmanager#V2.97a.20150601',
     'jquery-ui#1.11.4',

diff --git a/docker-compose.yml b/docker-compose.yml
index f998771a2c6269ead58c3cc22f0936ec16ec116f..1b5a4e5ed8f56eb8d802e835e0cb942a71ffe924 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,10 +25,10 @@
 data:
   image: debian:jessie
   volumes:
-    - /home/parisson/CREM/Telemeta/media/cache:/srv/media/cache
-    - /home/parisson/CREM/Telemeta/media/export:/srv/media/export
-    - /home/parisson/CREM/Telemeta/media/log:/srv/media/log
-    - /home/parisson/CREM/Telemeta/media/results:/srv/media/results
+    - /home/crem/media/cache:/srv/media/cache
+    - /home/crem/media/export:/srv/media/export
+    - /home/crem/media/log:/srv/media/log
+    - /home/crem/media/results:/srv/media/results
     - /archive/CREM/tmp:/srv/media/tmp
     - /archive/CREM/media/items:/srv/media/items
     - /archive/CREM/backup:/srv/backup