From f5a686f8f9e3a04e6a0e841d7e04af60fd3a8e3f Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sat, 29 Jul 2017 00:58:52 +0200 Subject: [PATCH] mount timeside plugins volume, add jqchat as editable module --- Dockerfile | 10 +++++----- docker-compose.yml | 1 + requirements-dev.txt | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5480650d..01c7feaa 100644 --- 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 b064e296..ee640661 100644 --- 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 1a3f8d6f..1d22a37a 100644 --- 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 -- 2.39.5