mount timeside plugins volume, add jqchat as editable module

diff --git a/Dockerfile b/Dockerfile
index 5480650d34316e43ef531a33669de92fdadf08a8..01c7feaa552add3ae5ee03bc0677ea70f323b71b 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,14 +30,14 @@ RUN chown www-data:www-data $PYTHON_EGG_CACHE
 COPY . /srv/src/telemeta
 WORKDIR /srv/src/telemeta
 
-# Install Timeside and plugins from ./lib
-COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh
-COPY ./lib/ /srv/src/plugins/
-RUN /bin/bash /srv/app/scripts/setup_plugins.sh
-
 # Install Telemeta
 RUN pip install -r requirements.txt
 RUN pip install -r requirements-dev.txt --src /srv/src
 
+# Install Timeside and plugins from ./lib
+COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh
+COPY ./lib/plugins /srv/src/plugins/
+RUN /bin/bash /srv/app/scripts/setup_plugins.sh
+
 WORKDIR /srv/app
 EXPOSE 8000

diff --git a/docker-compose.yml b/docker-compose.yml
index b064e29694ad29aa8b6bd9a4d2408dda2025098b..ee640661a5c5988811d9e8ae8e3762e7a30529e0 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,6 +55,7 @@ app:
     - ./app/:/srv/app
     - ./telemeta/:/srv/src/telemeta/telemeta
     - ./lib/TimeSide/:/srv/src/timeside
+    - ./lib/plugins:/srv/src/plugins
   volumes_from:
     - data
   env_file:

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1a3f8d6ff70ce9a4143ac6e23d7e1caf8290a0d0..1d22a37aff9935abb68678a970345025bcaaddec 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,3 +3,4 @@
 -e git+https://github.com/Parisson/ebooklib.git#egg=ebooklib-0.16
 -e git+https://github.com/Parisson/saved_searches.git#egg=saved_searches-2.0.0-beta
 -e git+https://github.com/maths28/django-haystack.git@v2.4.1.dev0#egg=django-haystack-2.4.1.dev0
+-e git+https://github.com/yomguy/django-jqchat.git#egg=django-jqchat