From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 29 Jul 2018 19:45:19 +0000 (+0200)
Subject: Use telemeta:1.7
X-Git-Tag: 1.7.0~2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=28ddc140b7bf6fa25e5708943beb6c0cad70e2f8;p=telemeta.git

Use telemeta:1.7
---

diff --git a/Dockerfile b/Dockerfile
index fea6e0e9..6bbd52b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,9 +29,9 @@ COPY . /srv/lib/telemeta
 WORKDIR /srv/lib/telemeta
 
 # Install Timeside and plugins from ./lib
-COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh
+COPY ./app/bin/setup_plugins.sh /srv/app/bin/setup_plugins.sh
 COPY ./lib/ /srv/lib/plugins/
-RUN /bin/bash /srv/app/scripts/setup_plugins.sh
+RUN /bin/bash /srv/app/bin/setup_plugins.sh
 
 # Install Telemeta
 RUN pip install -r requirements.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index 68585ff5..b6e6909c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,7 +51,7 @@ search:
   image: elasticsearch:1
 
 app:
-  image: parisson/telemeta:1.6
+  image: parisson/telemeta:1.7
   volumes:
     - ./app:/srv/app
     - ./telemeta:/srv/lib/telemeta/telemeta
@@ -66,7 +66,7 @@ app:
     - search
 
 worker:
-  image: parisson/telemeta:1.6
+  image: parisson/telemeta:1.7
   volumes_from:
     - app
     - data