deps: use timeside 0.9 image, build locally by default

diff --git a/Dockerfile b/Dockerfile
index e7f5a81404ea68f3d1947047ce7ffae351827ecc..d7fcfbf0132f27a58243f0e26fbfa65b769eda97 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM parisson/timeside:latest-dev
+FROM parisson/timeside:0.9
 
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@parisson.com>
 

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 29fdb508da1d8bd1aaef4901aac1230297546b1a..08f98a66700036e3b15cf1b3fdf23697e9cb7339 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -22,7 +22,7 @@ gid='www-data'
 # pip install django-debug-toolbar==1.6
 # pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat
 # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta
-pip install -U youtube-dl librosa
+pip install -U youtube-dl librosa django-cacheops==4.2
 
 # install plugins
 /srv/app/bin/setup_plugins.sh

diff --git a/app/settings.py b/app/settings.py
index 1bdc2d118db2a77e7db86de469c62d5a9821d295..bac341cb2039b7c871c485f7f0a8e271efffc0df 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -381,3 +381,4 @@ NOTEBOOK_ARGUMENTS = [
 SILENCED_SYSTEM_CHECKS = ['fields.W342',]
 
 FIRST_YEAR_PUBLISHED = 1857 # Year of patent filing of the 1st sound recorder by Édouard-Léon Scott de Martinville
+

diff --git a/docker-compose.yml b/docker-compose.yml
index 505d909bef9dd3bbbbfb5b84dfdea828adc45bec..31cb94a554692c7e50607e5a7bf02fb52ed24fff 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,7 +51,8 @@ search:
   image: elasticsearch:1.7
 
 app:
-  image: parisson/telemeta:1.7
+  # image: parisson/telemeta:1.7
+  build: .
   volumes:
     - ./app:/srv/app
     - ./telemeta:/srv/lib/telemeta/telemeta
@@ -70,7 +71,8 @@ app:
     - "8000:8000"
 
 worker:
-  image: parisson/telemeta:1.7
+  # image: parisson/telemeta:1.7
+  build: .
   volumes_from:
     - app
     - data